[ros-diffs] [reactos] 01/01: [INF] Set manufacturer as ReactOS Project for consistency

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbccad0ed60d619e49eb6…

commit bbccad0ed60d619e49eb6e5d4e85cf9e0d932e2e
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Mon Jun 27 17:00:18 2022 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Mon Jun 27 17:00:18 2022 +0300

    [INF] Set manufacturer as ReactOS Project for consistency
    
    Also make it non-localizable. CORE-18191
---
 drivers/bus/acpi/acpi.inf                     | 16 +++-------------
 drivers/network/dd/e1000/nete1000.inf         |  9 +++------
 drivers/network/dd/ne2000/netne2000.inf       | 18 +++++-------------
 drivers/network/dd/nvnet/netnv.inf            |  6 +++---
 drivers/network/dd/pcnet/netpcnet.inf         | 22 ++++------------------
 drivers/network/dd/rtl8139/netrtl8139.inf     | 15 +++------------
 drivers/processor/processr/cpu.inf            | 11 ++++-------
 drivers/storage/class/ramdisk/ramdisk.inf     |  8 ++++----
 drivers/usb/usbstor/usbstor.inf               | 12 +++---------
 drivers/wdm/audio/drivers/ac97/ac97.inf       |  5 ++++-
 media/inf/NET_NIC.inf                         | 12 ++++--------
 media/inf/audio.inf                           | 12 ++++--------
 media/inf/battery.inf                         | 20 ++++++++++----------
 media/inf/bda.inf                             | 11 +++--------
 media/inf/bth.inf                             | 11 ++++-------
 media/inf/c_image.inf                         | 11 ++++-------
 media/inf/display.inf                         | 14 ++++++--------
 media/inf/fdc.inf                             | 15 +++++++--------
 media/inf/flpydisk.inf                        | 16 +++-------------
 media/inf/hal.inf                             | 20 ++++++--------------
 media/inf/hdc.inf                             | 12 ++++--------
 media/inf/input.inf                           | 12 ++++--------
 media/inf/keyboard.inf                        | 12 ++++--------
 media/inf/ks.inf                              | 11 +++--------
 media/inf/kscaptur.inf                        |  9 +++------
 media/inf/legcydrv.inf                        | 11 ++++-------
 media/inf/machine.inf                         | 12 ++++--------
 media/inf/monitor.inf                         | 15 +++++++--------
 media/inf/msmouse.inf                         | 13 +++++--------
 media/inf/nettcpip.inf                        | 19 ++++---------------
 media/inf/ports.inf                           | 13 +++++--------
 media/inf/scsi.inf                            | 15 +++++++--------
 media/inf/unknown.inf                         | 14 ++++----------
 media/inf/usb.inf                             | 11 +++--------
 media/inf/usbport.inf                         | 14 ++++++--------
 media/inf/volume.inf                          |  8 ++++----
 media/inf/wmiacpi.inf                         | 10 ++++------
 modules/rosapps/drivers/green/green.inf       |  7 ++++---
 win32ss/drivers/miniport/pc98vid/pc98disp.inf |  8 ++++----
 win32ss/drivers/miniport/xboxvmp/xboxdisp.inf | 12 +++---------
 40 files changed, 173 insertions(+), 329 deletions(-)

diff --git a/drivers/bus/acpi/acpi.inf b/drivers/bus/acpi/acpi.inf
index 64693975404..b1b94764d30 100644
--- a/drivers/bus/acpi/acpi.inf
+++ b/drivers/bus/acpi/acpi.inf
@@ -41,8 +41,10 @@ LoadOrderGroup = Boot Bus Extender
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+; Localizable
 GenericMfg = "(Generic system devices)"
 *PNP0C08.DeviceDesc = "ACPI hardware"
 
@@ -58,8 +60,6 @@ GenericMfg = "(Generische Systemgeräte)"
 *PNP0C08.DeviceDesc = "ACPI Hardware"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 GenericMfg = "(Dispositivos del sistema estándar)"
 *PNP0C08.DeviceDesc = "Hardware ACPI"
 
@@ -71,8 +71,6 @@ GenericMfg = "(標準システム デバイス)"
 *PNP0C08.DeviceDesc = "ACPI ハードウェア"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 GenericMfg = "(Standardowe urządzenia systemowe)"
 *PNP0C08.DeviceDesc = "Sprzęt ACPI"
 
@@ -81,14 +79,10 @@ GenericMfg = "(Dispositivos de sistema padrão)"
 *PNP0C08.DeviceDesc = "Hardware ACPI"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
-
 GenericMfg = "(dispozitiv de sistem generic)"
 *PNP0C08.DeviceDesc = "Dispozitive ACPI"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
-
 GenericMfg = "(Стандартные системные устройства)"
 *PNP0C08.DeviceDesc = "Устройства ACPI"
 
@@ -97,14 +91,10 @@ GenericMfg = "(Generické systémové zariadenia)"
 *PNP0C08.DeviceDesc = "ACPI hardvér"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 GenericMfg = "(Genel Sistem Aygıtları)"
 *PNP0C08.DeviceDesc = "ACPI Donanım"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
-
 GenericMfg = "(Стандартні системні пристрої)"
 *PNP0C08.DeviceDesc = "Пристрої ACPI"
 
diff --git a/drivers/network/dd/e1000/nete1000.inf
b/drivers/network/dd/e1000/nete1000.inf
index 11f8ba13779..7ae4df0d4f1 100644
--- a/drivers/network/dd/e1000/nete1000.inf
+++ b/drivers/network/dd/e1000/nete1000.inf
@@ -79,10 +79,12 @@ LoadOrderGroup = NDIS
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
 IntelMfg = "Intel"
 
+; Localizable
 IntelE1000_1000.DeviceDesc = "Intel 82542-based PCI Ethernet Adapter"
 IntelE1000_1001.DeviceDesc = "Intel 82543GC Fiber PCI Ethernet Adapter"
 IntelE1000_1004.DeviceDesc = "Intel 82543GC Copper PCI Ethernet Adapter"
@@ -122,8 +124,6 @@ IntelE1000_1099.DeviceDesc = "Intel 82546GB Quad Copper PCI
Ethernet Adapter"
 IntelE1000_10B5.DeviceDesc = "Intel 82546GB Quad Copper KSP3 PCI-X Ethernet
Adapter"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 IntelE1000_1000.DeviceDesc = "Karta Intel 82542-based PCI Ethernet Adapter"
 IntelE1000_1001.DeviceDesc = "Karta Intel 82543GC Fiber PCI Ethernet Adapter"
 IntelE1000_1004.DeviceDesc = "Karta Intel 82543GC Copper PCI Ethernet Adapter"
@@ -163,9 +163,6 @@ IntelE1000_1099.DeviceDesc = "Karta Intel 82546GB Quad Copper PCI
Ethernet Adapt
 IntelE1000_10B5.DeviceDesc = "Karta Intel 82546GB Quad Copper KSP3 PCI-X Ethernet
Adapter"
 
 [Strings.0a]
-
-ReactOS = "Equipo de ReactOS"
-
 IntelE1000_1000.DeviceDesc = "Adaptador de Ethernet 82542-based PCI"
 IntelE1000_1001.DeviceDesc = "Adaptador de Ethernet 82543GC Fiber PCI"
 IntelE1000_1004.DeviceDesc = "Adaptador de Ethernet 82543GC Copper PCI"
diff --git a/drivers/network/dd/ne2000/netne2000.inf
b/drivers/network/dd/ne2000/netne2000.inf
index fb8a1df3067..0a99dacbcb1 100644
--- a/drivers/network/dd/ne2000/netne2000.inf
+++ b/drivers/network/dd/ne2000/netne2000.inf
@@ -62,12 +62,15 @@ LoadOrderGroup = NDIS
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+RealtekMfg = "Realtek Semiconductor Co., Ltd."
+
+; Localizable
 GenericMfg = "(Generic network cards)"
 *PNP80D6.DeviceDesc = "NE2000-compatible Ethernet Adapter"
 
-RealtekMfg = "Realtek Semiconductor Co., Ltd."
 *RTL8019.DeviceDesc = "Realtek RTL8019AS ISA Ethernet Adapter"
 PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 PCI Ethernet Adapter"
 
@@ -84,8 +87,6 @@ GenericMfg = "(Generische Netzwerkkarten)"
 *PNP80D6.DeviceDesc = "NE2000 kompatible Netzwerkkarte"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 GenericMfg = "(Tarjeta de red estándar)"
 *PNP80D6.DeviceDesc = "Compatible con NE2000"
 
@@ -98,8 +99,6 @@ GenericMfg = "(標準 ネットワーク カード)"
 *PNP80D6.DeviceDesc = "NE2000 互換"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 GenericMfg = "(Standardowe karty sieciowe)"
 *PNP80D6.DeviceDesc = "Karta sieciowa kompatybilna z NE2000"
 
@@ -111,14 +110,11 @@ GenericMfg = "(Adaptadores de rede padrão)"
 *PNP80D6.DeviceDesc = "Compatível com NE2000"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 
 GenericMfg = "(placă de rețea generică)"
 *PNP80D6.DeviceDesc = "Compatibile cu NE2000"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
-
 GenericMfg = "(Стандартные сетевые адаптеры)"
 *PNP80D6.DeviceDesc = "NE2000-совместимый сетевой адаптер"
 
@@ -127,14 +123,10 @@ GenericMfg = "(Generické sieťové karty)"
 *PNP80D6.DeviceDesc = "NE2000 kompatibilná sieťová karta"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 GenericMfg = "(Genel Ağ Kartları)"
 *PNP80D6.DeviceDesc = "NE2000 Uyumlu"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
-
 GenericMfg = "(Стандартні мережеві адаптери)"
 *PNP80D6.DeviceDesc = "NE2000-сумісний мережевий адаптер"
 
diff --git a/drivers/network/dd/nvnet/netnv.inf b/drivers/network/dd/nvnet/netnv.inf
index 31a05e9680b..5b95fe28d73 100644
--- a/drivers/network/dd/nvnet/netnv.inf
+++ b/drivers/network/dd/nvnet/netnv.inf
@@ -237,10 +237,12 @@ HKR, , TypesSupported,   0x00010001, 7
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
 nVidiaMfg = "nVidia"
 
+; Localizable
 OM = "Optimization Mode"
 M1 = "Dynamic"
 M2 = "CPU"
@@ -277,8 +279,6 @@ MCP79.DeviceDesc = "nVidia MCP79 PCI Ethernet Controller"
 MCP89.DeviceDesc = "nVidia MCP89 PCI Ethernet Controller"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
-
 OM = "Оптимизировать"
 M1 = "Динамически"
 M2 = "Нагрузку на ЦП"
diff --git a/drivers/network/dd/pcnet/netpcnet.inf
b/drivers/network/dd/pcnet/netpcnet.inf
index e1e5e13ce2c..2569fc41f06 100644
--- a/drivers/network/dd/pcnet/netpcnet.inf
+++ b/drivers/network/dd/pcnet/netpcnet.inf
@@ -56,27 +56,13 @@ LoadOrderGroup = NDIS
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
 AMDMfg = "Advanced Micro Devices (AMD)"
-PCNET.DeviceDesc = "AMD PCnet Am79C970 PCI Ethernet Adapter"
 
-[Strings.0a]
-ReactOS = "Equipo de ReactOS"
+; Localizable
+PCNET.DeviceDesc = "AMD PCnet Am79C970 PCI Ethernet Adapter"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 PCNET.DeviceDesc = "Karta AMD PCnet Am79C970 PCI Ethernet Adapter"
-
-[Strings.0418]
-ReactOS = "Echipa ReactOS"
-
-[Strings.0419]
-ReactOS = "Команда ReactOS"
-
-[Strings.041f]
-ReactOS = "ReactOS Takımı"
-
-[Strings.0422]
-ReactOS = "Команда ReactOS"
diff --git a/drivers/network/dd/rtl8139/netrtl8139.inf
b/drivers/network/dd/rtl8139/netrtl8139.inf
index 2e50c0a636b..157ab12f59c 100644
--- a/drivers/network/dd/rtl8139/netrtl8139.inf
+++ b/drivers/network/dd/rtl8139/netrtl8139.inf
@@ -61,7 +61,8 @@ LoadOrderGroup = NDIS
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
 RealtekMfg = "Realtek"
 AcctonMfg = "Accton"
@@ -69,6 +70,7 @@ DLinkMfg = "D-Link"
 LevelOneMfg = "LevelOne"
 CompaqMfg = "Compaq"
 
+; Localizable
 Realtek8139.DeviceDesc = "Realtek RTL8139 PCI Ethernet Adapter"
 AcctonEN1207D.DeviceDesc = "Accton EN-1207D (RTL8139) PCI Ethernet Adapter"
 DLinkDFE538TX.DeviceDesc = "D-Link DFE-538TX (RTL8139) PCI Ethernet Adapter"
@@ -76,8 +78,6 @@ LevelOneFPC0106TX.DeviceDesc = "LevelOne FPC-0106Tx (RTL8139) PCI
Ethernet Adapt
 CompaqHNE300.DeviceDesc = "Compaq HNE-300 (RTL8139C) PCI Ethernet Adapter"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 Realtek8139.DeviceDesc = "Adaptador Ethernet Realtek RTL8139 "
 AcctonEN1207D.DeviceDesc = "Adaptador Ethernet Accton EN-1207D (RTL8139)"
 DLinkDFE538TX.DeviceDesc = "Adaptador Ethernet D-Link DFE-538TX (RTL8139)"
@@ -85,8 +85,6 @@ LevelOneFPC0106TX.DeviceDesc = "Adaptador Ethernet LevelOne
FPC-0106Tx (RTL8139)
 CompaqHNE300.DeviceDesc = "Adaptador Ethernet Compaq HNE-300 (RTL8139C)"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 Realtek8139.DeviceDesc = "Karta Realtek RTL8139 PCI Ethernet Adapter"
 AcctonEN1207D.DeviceDesc = "Karta Accton EN-1207D (RTL8139) PCI Ethernet
Adapter"
 DLinkDFE538TX.DeviceDesc = "Karta D-Link DFE-538TX (RTL8139) PCI Ethernet
Adapter"
@@ -94,20 +92,13 @@ LevelOneFPC0106TX.DeviceDesc = "Karta LevelOne FPC-0106Tx
(RTL8139) PCI Ethernet
 CompaqHNE300.DeviceDesc = "Karta Compaq HNE-300 (RTL8139C) PCI Ethernet
Adapter"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
-
 Realtek8139.DeviceDesc = "Adaptor Ethernet Realtek RTL8139"
 AcctonEN1207D.DeviceDesc = "Adaptor Ethernet Accton EN-1207D (RTL8139)"
 DLinkDFE538TX.DeviceDesc = "Adaptor Ethernet D-Link DFE-538TX (RTL8139)"
 LevelOneFPC0106TX.DeviceDesc = "Adaptor Ethernet LevelOne FPC-0106Tx
(RTL8139)"
 CompaqHNE300.DeviceDesc = "Adaptor Ethernet Compaq HNE-300 (RTL8139C)"
 
-[Strings.0419]
-ReactOS = "Команда ReactOS"
-
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 Realtek8139.DeviceDesc = "Realtek RTL8139 Ethernet Bağdaştırıcısı"
 AcctonEN1207D.DeviceDesc = "Accton EN-1207D (RTL8139) Ethernet Bağdaştırıcısı"
 DLinkDFE538TX.DeviceDesc = "D-Link DFE-538TX (RTL8139) Ethernet
Bağdaştırıcısı"
diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf
index 23608ebbeb3..754514f4ac3 100644
--- a/drivers/processor/processr/cpu.inf
+++ b/drivers/processor/processr/cpu.inf
@@ -120,7 +120,10 @@ LoadOrderGroup = Extended Base
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 ProcessorClassName = "Processors"
 
 CyrixMfg = "Cyrix"
@@ -268,7 +271,6 @@ IntelProcessor.DeviceDesc = "Intel プロセッサ"
 Standard = "スタンダードプロセッサ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 ProcessorClassName = "Procesory"
 
 Processor.DeviceDesc = "Procesor"
@@ -307,7 +309,6 @@ IntelProcessor.DeviceDesc = "Procesador Intel"
 Standard = "Processador padrão"
 
 [Strings.0418]
-ReactOS = "Fundația ReactOS"
 ProcessorClassName = "Procesoare"
 
 Processor.DeviceDesc = "Procesor"
@@ -340,7 +341,6 @@ ViaNANOProcessor.DeviceDesc = "Procesor VIA Nano"
 ViaProcessor.DeviceDesc = "Procesor VIA"
 
 [Strings.0419]
-ReactOS = "Фонд ReactOS"
 ProcessorClassName = "Процессоры"
 
 Processor.DeviceDesc = "Процессор"
@@ -379,7 +379,6 @@ IntelProcessor.DeviceDesc = "Intel procesor"
 Standard = "Štandardný procesor"
 
 [Strings.041f]
-ReactOS = "ReactOS Vakfı"
 ProcessorClassName = "İşlemciler"
 
 Processor.DeviceDesc = "İşlemci"
@@ -412,7 +411,6 @@ ViaNANOProcessor.DeviceDesc = "VIA Nano İşlemci"
 ViaProcessor.DeviceDesc = "VIA İşlemci"
 
 [Strings.0422]
-ReactOS = "Фонд ReactOS"
 ProcessorClassName = "Процесори"
 
 Processor.DeviceDesc = "Процесор"
@@ -481,7 +479,6 @@ ViaNANOProcessor.DeviceDesc = "VIA Nano 处理器"
 ViaProcessor.DeviceDesc = "VIA 处理器"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 ProcessorClassName = "Procesadores"
 
 Processor.DeviceDesc = "Procesador"
diff --git a/drivers/storage/class/ramdisk/ramdisk.inf
b/drivers/storage/class/ramdisk/ramdisk.inf
index 99b9aec03b8..db73ccf7b17 100644
--- a/drivers/storage/class/ramdisk/ramdisk.inf
+++ b/drivers/storage/class/ramdisk/ramdisk.inf
@@ -55,28 +55,28 @@ AddService = , 2
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 RamdiskClassName = "Ramdisk"
 RamdiskBus.Desc = "RAM disk controller"
 RamdiskVolume.Desc = "RAM disk device (volume)"
 Ramdisk.ServiceDesc = "ReactOS RAM Disk Driver"
 
 [Strings.040C]
-ReactOS = "Equipe ReactOS"
 RamdiskClassName = "Ramdisk"
 RamdiskBus.Desc = "Controleur de disque virtuel"
 RamdiskVolume.Desc = "Disque virtuel (volume)"
 Ramdisk.ServiceDesc = "Pilote de disque virtuel ReactOS"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 RamdiskClassName = "Ramdisk"
 RamdiskBus.Desc = "Kontroler dysku RAM"
 RamdiskVolume.Desc = "Urządzenie dysku RAM (wolumin)"
 Ramdisk.ServiceDesc = "Sterownik dysku RAM systemu ReactOS"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 RamdiskClassName = "RAM-диски"
 RamdiskBus.Desc = "Контроллер RAM-диска"
 RamdiskVolume.Desc = "Устройство RAM-диска (том)"
diff --git a/drivers/usb/usbstor/usbstor.inf b/drivers/usb/usbstor/usbstor.inf
index 8d6df54bebd..40fe8cd940e 100644
--- a/drivers/usb/usbstor/usbstor.inf
+++ b/drivers/usb/usbstor/usbstor.inf
@@ -43,8 +43,10 @@ ServiceBinary = %12%\usbstor.sys
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+; Localizable
 GenericMfg = "(Generic USB devices)"
 GenericBulkOnlyTransport.DeviceDesc = "USB Storage device"
 
@@ -61,8 +63,6 @@ GenericMfg = "(Generische USB-Geräte)"
 GenericBulkOnlyTransport.DeviceDesc = "USB Datenträger-Geräte"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 GenericMfg = "(Dispositivo USB estándar)"
 GenericBulkOnlyTransport.DeviceDesc = "Dispositivo de almacenamiento USB"
 
@@ -75,7 +75,6 @@ GenericMfg = "(標準 USB デバイス)"
 GenericBulkOnlyTransport.DeviceDesc = "USB ストレージ デバイス"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 GenericMfg = "(Standardowe urządzenia USB)"
 GenericBulkOnlyTransport.DeviceDesc = "Urządzenie pamięci masowej USB"
 
@@ -84,12 +83,10 @@ GenericMfg = "(Dispositivo USB padrão)"
 GenericBulkOnlyTransport.DeviceDesc = "Dispositivo de armazenamento USB"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 GenericMfg = "(dispozitive generice USB)"
 GenericBulkOnlyTransport.DeviceDesc = "Dispozitiv USB de stocare"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 GenericMfg = "(Стандартные устройства USB)"
 GenericBulkOnlyTransport.DeviceDesc = "Запоминающее устройство USB"
 
@@ -98,13 +95,10 @@ GenericMfg = "(Generické USB zariadenia)"
 GenericBulkOnlyTransport.DeviceDesc = "USB úložné zariadenie"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 GenericMfg = "(Genel USB Aygıtları)"
 GenericBulkOnlyTransport.DeviceDesc = "USB Depolama Aygıtı"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 GenericMfg = "(Стандартні пристрої USB)"
 GenericBulkOnlyTransport.DeviceDesc = "USB-накопичувач"
 
diff --git a/drivers/wdm/audio/drivers/ac97/ac97.inf
b/drivers/wdm/audio/drivers/ac97/ac97.inf
index 7c3a8350720..e6c8beb1953 100644
--- a/drivers/wdm/audio/drivers/ac97/ac97.inf
+++ b/drivers/wdm/audio/drivers/ac97/ac97.inf
@@ -334,8 +334,11 @@ AddService = ac97, 0x00000002, ac97_Service_Inst
 
 
 [Strings]
-ReactOS="ReactOS Team"
+; Non-localizable
+ReactOS="ReactOS Project"
 MfgName="Intel"
+
+; Localizable
 DiskDescription="AC'97 WDM Driver Disk"
 
 ac97_440MX.DeviceDesc="Intel 82440MX AC'97 Audio Controller"
diff --git a/media/inf/NET_NIC.inf b/media/inf/NET_NIC.inf
index 2a8d1e17c4b..f4dbccba750 100644
--- a/media/inf/NET_NIC.inf
+++ b/media/inf/NET_NIC.inf
@@ -25,7 +25,10 @@ HKR, , Installer32,     0, "NetCfgx.dll,NetClassInstaller"

HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}\0000","",0x00010000,""
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 DisplayClassName = "Network Adapters"
 
 [Strings.0404]
@@ -41,7 +44,6 @@ DisplayClassName = "Netzwerkadapter"
 DisplayClassName = "Προσαρμογείς δικτύου"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 DisplayClassName = "Adaptadores de red"
 
 [Strings.040C]
@@ -51,36 +53,30 @@ DisplayClassName = "Cartes réseau"
 DisplayClassName = "ネットワーク アダプタ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 DisplayClassName = "Karty sieciowe"
 
 [Strings.0416]
 DisplayClassName = "Adaptadores de rede"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 DisplayClassName = "Adaptoare de rețea"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 DisplayClassName = "Сетевые адаптеры"
 
 [Strings.041B]
 DisplayClassName = "Sieťové adaptéry"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 DisplayClassName = "Ağ Bağdaştırıcıları"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 DisplayClassName = "Мережеві адаптери"
 
 [Strings.0427]
 DisplayClassName = "Tinklo adapteriai"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 DisplayClassName = "Adaptadores de rede"
 
 [Strings.0C04]
diff --git a/media/inf/audio.inf b/media/inf/audio.inf
index 4fa654f813c..d54a4dded00 100644
--- a/media/inf/audio.inf
+++ b/media/inf/audio.inf
@@ -66,7 +66,10 @@ ServiceBinary = %12%\sysaudio.sys
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 AUDIOClassName = "Audio & Videocontroller"
 
 [Strings.0404]
@@ -79,30 +82,24 @@ AUDIOClassName = "Řadiče zvuku a obrazu"
 AUDIOClassName = "Audio-, Video- und Gamecontroller"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 AUDIOClassName = "Dispositivos de sonido, vídeo y juegos"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 AUDIOClassName = "Kontrolery audio, wideo i gier"
 
 [Strings.0416]
 AUDIOClassName = "Controladores de som, vídeo e jogo"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 AUDIOClassName = "Dispozitive audio & video"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 AUDIOClassName = "Аудио и видео контроллер"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 AUDIOClassName = "Ses ve Video Denetleyicisi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 AUDIOClassName = "Контроллер аудіо та відео"
 
 [Strings.0427]
@@ -112,7 +109,6 @@ AUDIOClassName = "Garso, vaizdo ir žaidimu irenginiai"
 AUDIOClassName = "音视频控制器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 AUDIOClassName = "Controladores de som, vídeo e jogos"
 
 [Strings.0C04]
diff --git a/media/inf/battery.inf b/media/inf/battery.inf
index 0047890ac3b..b4be987fe53 100644
--- a/media/inf/battery.inf
+++ b/media/inf/battery.inf
@@ -69,10 +69,14 @@ ErrorControl  = 1
 ServiceBinary = %12%\cmbatt.sys
 
 [Strings]
-ReactOS = "ReactOS Team"
-BatteryClassName = "Batteries"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
 REG_BINARY = 1
 
+; Localizable
+BatteryClassName = "Batteries"
+
 GenericMfg = "(Generic batteries)"
 ACPI\PNP0C0A.DeviceDesc = "ACPI-compliant control method battery"
 ACPI\ACPI0003.DeviceDesc = "AC adapter"
@@ -97,7 +101,6 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI-konforme
Kontrollmethodenbatterie"
 ACPI\ACPI0003.DeviceDesc = "Netzteil"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 BatteryClassName = "Baterías"
 
 GenericMfg = "(Baterías genéricas)"
@@ -111,7 +114,6 @@ ACPI\PNP0C0A.DeviceDesc = "Batterie à méthode de contrôle
compatible ACPI"
 ACPI\ACPI0003.DeviceDesc = "Adaptateur secteur"
 
 [Strings.040D]
-ReactOS = "צוות ReactOS"
 BatteryClassName = "סוללות"
 
 GenericMfg = "(סוללות כלליות)"
@@ -119,21 +121,20 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI-compliant control method
battery"
 ACPI\ACPI0003.DeviceDesc = "AC adapter"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 BatteryClassName = "Baterie"
+
 GenericMfg = "(Standardowe baterie)"
 ACPI\PNP0C0A.DeviceDesc = "Bateria zgodna z ACPI"
 ACPI\ACPI0003.DeviceDesc = "Zasilacz"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 BatteryClassName = "Acumulatori"
+
 GenericMfg = "(acumulator generic)"
 ACPI\PNP0C0A.DeviceDesc = "Metodă de control acumulator conformă cu ACPI"
 ACPI\ACPI0003.DeviceDesc = "Adaptor de curent alternativ"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 BatteryClassName = "Батареи"
 
 GenericMfg = "(Стандартные батареи)"
@@ -141,7 +142,6 @@ ACPI\PNP0C0A.DeviceDesc = "Батареи с ACPI-совместимым мет
 ACPI\ACPI0003.DeviceDesc = "AC адаптер"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 BatteryClassName = "Piller"
 
 GenericMfg = "(Genel Piller)"
@@ -149,8 +149,8 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI Uyumlu Denetim Yöntemi
Pili"
 ACPI\ACPI0003.DeviceDesc = "AC Adaptörü"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 BatteryClassName = "Батареї"
+
 GenericMfg = "(Стандартні батареї)"
 ACPI\PNP0C0A.DeviceDesc = "Батареї з ACPI-сумісним методом керування"
 ACPI\ACPI0003.DeviceDesc = "AC адаптер"
@@ -161,8 +161,8 @@ ACPI\PNP0C0A.DeviceDesc = "ACPI 兼容控制模式电池"
 ACPI\ACPI0003.DeviceDesc = "交流适配器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 BatteryClassName = "Baterias"
+
 GenericMfg = "(Baterias genéricas)"
 ACPI\PNP0C0A.DeviceDesc = "Método de control de bateria compativel com ACPI"
 ACPI\ACPI0003.DeviceDesc = "Adaptador de corrente alterna"
diff --git a/media/inf/bda.inf b/media/inf/bda.inf
index 95c16614625..212212cebd3 100644
--- a/media/inf/bda.inf
+++ b/media/inf/bda.inf
@@ -138,7 +138,9 @@ PsisDecd.dll,,,COPYFLG_NO_VERSION_DIALOG
 BdaPlgIn.ax,,,COPYFLG_NO_VERSION_DIALOG
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
 RunOnce="SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce"
 ActiveMovieCategories="CLSID\{da4e3da0-d07d-11d0-bd50-00a0c911ce86}\Instance"
 MediaCategories="SYSTEM\CurrentControlSet\Control\MediaCategories"
@@ -192,7 +194,6 @@ Pin.Name.MPE="MPE"
 Pin.Name.NABTS="NABTS"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 Category_BdaTuner="Filtro de BDA-Source"
 Category_BdaComponent="Componente de Receptor de BDA"
 Category_BdaRenderer="Filtro de playback BDA"
@@ -204,7 +205,6 @@ Pin.Name.MPE="MPE"
 Pin.Name.NABTS="NABTS"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 Category_BdaTuner=" Filtr źródła BDA"
 Category_BdaComponent="Komponent odbioru BDA"
 Category_BdaRenderer="Filtr odtwarzania BDA"
@@ -216,7 +216,6 @@ Pin.Name.MPE="MPE"
 Pin.Name.NABTS="NABTS"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 Category_BdaTuner="Filtru sursă BDA"
 Category_BdaComponent="Componentă receptor BDA"
 Category_BdaRenderer="Filtru de redare BDA"
@@ -225,7 +224,6 @@ PlugIn_BdaCA="Extensie BDA pentru acces condițional"
 Pin.Name.AtscTS="Transport MPEG2"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 Category_BdaTuner="Фильтр источника BDA"
 Category_BdaComponent="Компонент BDA-приемник"
 Category_BdaRenderer="Фильтр воспроизводителя BDA"
@@ -234,7 +232,6 @@ PlugIn_BdaCA="BDA-плагин условного доступа"
 Pin.Name.AtscTS="Транспорт MPEG2"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 Category_BdaTuner="BDA-Kaynak Süzgeci"
 Category_BdaComponent="BDA-Alıcı Bileşeni"
 Category_BdaRenderer="BDA-Yeniden Çalma Süzgeci"
@@ -246,7 +243,6 @@ Pin.Name.MPE="MPE"
 Pin.Name.NABTS="NABTS"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 Category_BdaTuner="Фільтр джерела BDA"
 Category_BdaComponent="Компонент BDA-приймач"
 Category_BdaRenderer="Фільтр відтворювача BDA"
@@ -266,7 +262,6 @@ PlugIn_BdaCA="BDA 条件接入插件"
 Pin.Name.AtscTS="MPEG2 传输"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 Category_BdaTuner="Filtro BDA-Source"
 Category_BdaComponent="Componente Receptor de BDA"
 Category_BdaRenderer="Filtro playback BDA"
diff --git a/media/inf/bth.inf b/media/inf/bth.inf
index fbf28321c26..86d5f462c57 100644
--- a/media/inf/bth.inf
+++ b/media/inf/bth.inf
@@ -58,7 +58,10 @@ fbtusb.sys
 ;---------------------------------------------------------------;
 
 [Strings]
-ReactOS="ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 BTUSB.DeviceDesc="Generic USB Bluetooth Radio"
 BluetoothClassName="Bluetooth Radios"
 
@@ -75,27 +78,22 @@ BTUSB.DeviceDesc="USB-Treiber für Bluetooth-Funkgerät"
 BluetoothClassName="Bluetooth Funkgeräte"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 BTUSB.DeviceDesc="Radio Bluetooth USB genérica"
 BluetoothClassName="Radios Bluetooth"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 BTUSB.DeviceDesc="Standardowy odbiornik radiowy Bluetooth na USB"
 BluetoothClassName="Odbiorniki radiowe Bluetooth"
 
 [Strings.0418]
-ReactOS="Echipa ReactOS"
 BTUSB.DeviceDesc="Radio Bluetooth USB generic"
 BluetoothClassName="Radiouri Bluetooth"
 
 [Strings.0419]
-ReactOS="Команда ReactOS"
 BTUSB.DeviceDesc="Стандартный USB Bluetooth радиомодуль"
 BluetoothClassName="Радиомодули Bluetooth"
 
 [Strings.041f]
-ReactOS="ReactOS Takımı"
 BTUSB.DeviceDesc="Genel USB Bluetooth Radyo"
 BluetoothClassName="Bluetooth Radyoları"
 
@@ -103,7 +101,6 @@ BluetoothClassName="Bluetooth Radyoları"
 BTUSB.DeviceDesc="通用 USB 蓝牙无线电"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 BTUSB.DeviceDesc="Rádio Bluetooth USB genérico"
 BluetoothClassName="Rádios Bluetooth"
 
diff --git a/media/inf/c_image.inf b/media/inf/c_image.inf
index b27a1bf52bf..86a24893b12 100644
--- a/media/inf/c_image.inf
+++ b/media/inf/c_image.inf
@@ -24,34 +24,31 @@ HKR, , Icon, 0, "2"
 HKR,,Installer32, 0,"sti_ci.dll,ClassInstall"
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 ImageClassName = "Image"
 
 [Strings.0404]
 ImageClassName = "圖像"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 ImageClassName = "Imagen"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 ImageClassName = "Obraz"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 ImageClassName = "Imagine"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 ImageClassName = "Образ"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 ImageClassName = "Resim"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 ImageClassName = "Imagem"
 
 [Strings.0c04]
diff --git a/media/inf/display.inf b/media/inf/display.inf
index 4b076b834f5..55fd86c792b 100644
--- a/media/inf/display.inf
+++ b/media/inf/display.inf
@@ -58,7 +58,10 @@ LoadOrderGroup = Video Save
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 DisplayClassName = "Display Adapters"
 
 StdMfg = "(Standard display adapters)"
@@ -89,7 +92,6 @@ StdMfg = "(Πρότυποι προσαρμογείς οθόνης)"
 VGA.DeviceDesc = "VGA-συμβατή κάρτα γραφικών"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 DisplayClassName = "Adaptadores de pantalla"
 
 StdMfg = "(Adaptador de pantalla estándar)"
@@ -108,8 +110,8 @@ StdMfg = "(標準ディスプレイ アダプタ)"
 VGA.DeviceDesc = "VGA互換 グラフィックカード"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 DisplayClassName = "Karty graficzne"
+
 StdMfg = "(Standardowe karty graficzne)"
 VGA.DeviceDesc = "Karta graficzna kompatybilna z VGA"
 
@@ -120,13 +122,12 @@ StdMfg = "(Adaptador de vídeo padrão)"
 VGA.DeviceDesc = "Adaptador de vídeo compatível com VGA"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 DisplayClassName = "Adaptoare grafice"
+
 StdMfg = "(adaptoare grafice standard)"
 VGA.DeviceDesc = "Placă grafică compatibilă VGA"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 DisplayClassName = "Графические адаптеры"
 
 StdMfg = "(Стандартные графические адаптеры)"
@@ -139,14 +140,12 @@ StdMfg = "(Štandardné grafické karty)"
 VGA.DeviceDesc = "VGA kompatibilná grafická karta"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 DisplayClassName = "Görüntü Bağdaştırıcıları"
 
 StdMfg = "(Standart Görüntü Bağdaştırıcıları)"
 VGA.DeviceDesc = "VGA Uyumlu Grafik Kartı"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 DisplayClassName = "Графічні адаптери"
 
 StdMfg = "(Стандартні графічні адаптери)"
@@ -163,7 +162,6 @@ StdMfg = "（标准显示适配器）"
 VGA.DeviceDesc = "VGA 兼容显示卡"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 DisplayClassName = "Adaptadores de vídeo"
 
 StdMfg = "(Adaptador de vídeo padrão)"
diff --git a/media/inf/fdc.inf b/media/inf/fdc.inf
index dd919bfbd98..db8283649e5 100644
--- a/media/inf/fdc.inf
+++ b/media/inf/fdc.inf
@@ -58,7 +58,10 @@ AddService = , 0x00000002
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 FDCClassName = "Floppy disk controllers"
 
 GenericMfg = "(Generic floppy disk controllers)"
@@ -89,7 +92,6 @@ GenericMfg = "(Γενικοί ελεγκτές δισκέτας)"
 *PNP0700.DeviceDesc = "Γενικός ελεγκτής δισκέτας"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 FDCClassName = "Controladores de disquete"
 
 GenericMfg = "(Controlador estándar de disquetes)"
@@ -108,8 +110,8 @@ GenericMfg = "(標準フロッピー ディスク コントローラ)"
 *PNP0700.DeviceDesc = "標準フロッピー ディスク コントローラ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 FDCClassName = "Kontrolery stacji dyskietek"
+
 GenericMfg = "(Standardowowe kontrolery stacji dyskietek)"
 *PNP0700.DeviceDesc = "Standardowy kontroler stacji dyskietek"
 
@@ -120,13 +122,12 @@ GenericMfg = "(Unidades de disquete padrão)"
 *PNP0700.DeviceDesc = "Controlador padrão de disquete"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 FDCClassName = "Dispozitive de control disc flexibil"
+
 GenericMfg = "(dispozitiv generic de control disc flexibil)"
 *PNP0700.DeviceDesc = "Dispozitiv generic de control disc flexibil"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 FDCClassName = "Контроллеры гибких дисков"
 
 GenericMfg = "(Стандартные контроллеры гибких дисков)"
@@ -139,14 +140,12 @@ GenericMfg = "(Generické radiče disketových mechaník)"
 *PNP0700.DeviceDesc = "Generický radič disketovej mechaniky"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 FDCClassName = "Disket Denetleyicileri"
 
 GenericMfg = "(Genel Disket Denetleyicileri)"
 *PNP0700.DeviceDesc = "Genel Disket Denetleyicisi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 FDCClassName = "Контроллери гнучких дисків"
 
 GenericMfg = "(Стандартні контроллери гнучких дисків)"
@@ -163,8 +162,8 @@ GenericMfg = "(通用软盘控制器)"
 *PNP0700.DeviceDesc = "通用软盘控制器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 FDCClassName = "Unidades de disquete"
+
 GenericMfg = "(Unidades de disquete padrão)"
 *PNP0700.DeviceDesc = "Controlador de disquete padrão"
 
diff --git a/media/inf/flpydisk.inf b/media/inf/flpydisk.inf
index 0ba41a94344..550615572f3 100644
--- a/media/inf/flpydisk.inf
+++ b/media/inf/flpydisk.inf
@@ -58,8 +58,10 @@ AddService = , 0x00000002
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+; Localizable
 FloppyClassName = "Floppy disk drives"
 GenericMfg = "(Generic floppy disk drives)"
 Floppy.DeviceDesc = "Generic floppy disk drive"
@@ -70,42 +72,32 @@ GenericMfg = "（標準軟碟機）"
 Floppy.DeviceDesc = "標準軟碟機"
 
 [Strings.0405]
-ReactOS = "ReactOS Team"
-
 FloppyClassName = "Disketové jednotky"
 GenericMfg = "(Obecné disketové jednotky)"
 Floppy.DeviceDesc = "Obecná disketová jednotka"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 FloppyClassName = "Disqueteras"
 GenericMfg = "(Disqueteras genéricas)"
 Floppy.DeviceDesc = "Disquetera genérica"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 FloppyClassName = "Stacje dyskietek"
 GenericMfg = "(Standardowe stacje dyskietek)"
 Floppy.DeviceDesc = "Standardowa stacja dyskietek"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 FloppyClassName = "Unitate de disc flexibil"
 GenericMfg = "(unități generice de disc flexibil)"
 Floppy.DeviceDesc = "Unitate de disc flexibil"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 FloppyClassName = "Дисководы гибких дисков"
 GenericMfg = "(Универсальные дисководы гибких дисков)"
 Floppy.DeviceDesc = "Универсальный дисковод гибких дисков"
 
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 FloppyClassName = "Disket Sürücüleri"
 GenericMfg = "(Genel Disket Sürücüleri)"
 Floppy.DeviceDesc = "Genel Disket Sürücüsü"
@@ -115,8 +107,6 @@ GenericMfg = "（通用软盘驱动器）"
 Floppy.DeviceDesc = "通用软盘驱动器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
-
 FloppyClassName = "Controlador disquete"
 GenericMfg = "(Controlador disquete Genérico)"
 Floppy.DeviceDesc = "Controlador disquete Genérico"
diff --git a/media/inf/hal.inf b/media/inf/hal.inf
index f90ba12a10c..7bfadaabb99 100644
--- a/media/inf/hal.inf
+++ b/media/inf/hal.inf
@@ -46,8 +46,10 @@ AddService = , 0x00000002
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+; Localizable
 ComputerClassName = "Computer"
 
 GenericMfg = "(Generic computers)"
@@ -83,8 +85,6 @@ xbox.DeviceDesc = "Original Xbox (x86 based)"
 pc98_up.DeviceDesc = "Uniprocessor NEC PC-98"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 ComputerClassName = "Equipo"
 
 GenericMfg = "(Equipos genéricos)"
@@ -97,8 +97,6 @@ xbox.DeviceDesc = "Original Xbox (x86 based)"
 pc98_up.DeviceDesc = "Uniprocessor NEC PC-98"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 ComputerClassName = "Komputer"
 
 GenericMfg = "(Komputery standardowe)"
@@ -111,8 +109,6 @@ xbox.DeviceDesc = "Oryginalny Xbox (oparty na procesorze
x86)"
 pc98_up.DeviceDesc = "Komputer NEC PC-98"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
-
 ComputerClassName = "Calculator"
 
 GenericMfg = "(calculatoare generice)"
@@ -125,8 +121,6 @@ xbox.DeviceDesc = "Original Xbox (x86 based)"
 pc98_up.DeviceDesc = "Uniprocessor NEC PC-98"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
-
 ComputerClassName = "Компьютер"
 
 GenericMfg = "(Универсальный компьютер)"
@@ -139,8 +133,6 @@ xbox.DeviceDesc = "Оригинальный Xbox (на базе x86)"
 pc98_up.DeviceDesc = "Однопроцессорный NEC PC-98"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 ComputerClassName = "Bilgisayar"
 
 GenericMfg = "(Genel Bilgisayarlar)"
@@ -153,8 +145,6 @@ xbox.DeviceDesc = "Özgün Xbox (x86 tabanlı)"
 pc98_up.DeviceDesc = "Tek İşlemcili NEC PC-98"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
-
 ComputerClassName = "Комп'ютер"
 
 GenericMfg = "(Стандартний комп'ютер)"
@@ -177,13 +167,15 @@ xbox.DeviceDesc = "Original Xbox (x86 based)"
 pc98_up.DeviceDesc = "Uniprocessor NEC PC-98"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 ComputerClassName = "Computador"
+
 GenericMfg = "(Computador Genérico)"
 acpipic_up.DeviceDesc = "ACPI Uniprocessor PC"
 e_isa_up.DeviceDesc = "Standard Uniprocessor PC"
+
 MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
+
 NecMfg = "NEC"
 pc98_up.DeviceDesc = "Uniprocessor NEC PC-98"
 
diff --git a/media/inf/hdc.inf b/media/inf/hdc.inf
index f1efd9fa456..d893de7560c 100644
--- a/media/inf/hdc.inf
+++ b/media/inf/hdc.inf
@@ -379,7 +379,10 @@ LoadOrderGroup = System Bus Extender
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 HDCClassName = "IDE ATA/ATAPI controllers"
 GenericMfg = "(Generic hard disk controllers)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 controller"
@@ -1020,7 +1023,6 @@ PCI\CC_0105.DeviceDesc  = "Obecný řadič ATA"
 PCI\CC_0106.DeviceDesc  = "Obecný řadič Serial ATA"
 
 [Strings.0407]
-ReactOS = "ReactOS Team"
 HDCClassName = "IDE ATA/ATAPI Controller"
 GenericMfg = "(Generische Festplatten-Controller)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 Controller"
@@ -1336,7 +1338,6 @@ PCI\CC_0106.DeviceDesc  = "Generischer Serial ATA
Controller"
 
 
 [Strings.0a]
-ReactOS                 = "Equipo de ReactOS"
 HDCClassName            = "Controladores IDE ATA/ATAPI genéricos"
 GenericMfg              = "(Controladores de disco duro genéricos)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Controlador Acard ATP850 ATA-33"
@@ -1651,7 +1652,6 @@ PCI\CC_0105.DeviceDesc  = "Controlador ATA genérico"
 PCI\CC_0106.DeviceDesc  = "Controlador Serial ATA genérico"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 HDCClassName = "Kontrolery IDE ATA/ATAPI"
 GenericMfg = "(Standardowe kontrolery IDE ATA/ATAPI)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Kontroler Acard ATP850 ATA-33"
@@ -1966,7 +1966,6 @@ PCI\CC_0105.DeviceDesc  = "Standardowy kontroler ATA"
 PCI\CC_0106.DeviceDesc  = "Standardowy kontroler Serial ATA"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 HDCClassName = "Dispozitive de control IDE ATA/ATAPI"
 GenericMfg = "(dispozitive generice de control HDD)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Dispozitiv de control Acard ATP850
ATA-33"
@@ -2257,7 +2256,6 @@ PCI\CC_0105.DeviceDesc  = "Dispozitiv de control ATA
generic"
 PCI\CC_0106.DeviceDesc  = "Dispozitiv de control Serial ATA generic"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 HDCClassName = "IDE ATA/ATAPI контроллеры"
 GenericMfg = "(Универсальный контроллер жесткого диска)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 контроллер"
@@ -2573,7 +2571,6 @@ PCI\CC_0106.DeviceDesc  = "Универсальный Serial ATA контрол
 
 ; Turkish
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 HDCClassName = "IDE ATA/ATAPI Denetleyicileri"
 GenericMfg = "(Genel Sabit Disk Denetleyicileri)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 Denetleyicisi"
@@ -2888,7 +2885,6 @@ PCI\CC_0105.DeviceDesc  = "Genel ATA Denetleyicisi"
 PCI\CC_0106.DeviceDesc  = "Genel Seri ATA Denetleyicisi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 HDCClassName = "Контроллери IDE ATA/ATAPI"
 GenericMfg = "(Стандартні контроллери жорстких дисків)"
 PCI\VEN_1191&DEV_0005.DeviceDesc="Контроллер Acard ATP850 ATA-33"
diff --git a/media/inf/input.inf b/media/inf/input.inf
index 9eecb543b64..c44d046a80b 100644
--- a/media/inf/input.inf
+++ b/media/inf/input.inf
@@ -74,7 +74,10 @@ ServiceBinary = %12%\hidusb.sys
 LoadOrderGroup = Extended Base
 
 [Strings]
-ReactOS               = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 HID.ClassName         = "Human Interface Devices"
 HID.DeviceDesc        = "USB Human Interface Device"
 
@@ -106,7 +109,6 @@ HID_DEVICE            = "Zařízení standardu HID"
 StdMfg                = "(Obecná zařízení standardu HID)"
 
 [Strings.0a]
-ReactOS               = "Equipo de ReactOS"
 HID.ClassName         = "Dispositivos de interfaz humana"
 HID.DeviceDesc        = "Dispositivos de interfaz humana USB"
 
@@ -114,7 +116,6 @@ HID_DEVICE            = "Dispositivo compatible con otros
dispositivos de interf
 StdMfg                = "(Dispositivos de interfaz humana estándar)"
 
 [Strings.0415]
-ReactOS               = "Zespół ReactOS"
 HID.ClassName         = "Urządzenia interfejsu HID"
 HID.DeviceDesc        = "Urządzenie USB interfejsu HID"
 
@@ -123,7 +124,6 @@ StdMfg                = "(Standardowe urządzenia HID)"
 MSMice                = "Microsoft"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 HID.ClassName = "Dispozitive de interfațare umană"
 HID.DeviceDesc = "Dispozitiv USB de interfațare umană"
 
@@ -131,7 +131,6 @@ HID_DEVICE =  "Dispozitiv compatibil de interfațare umană"
 StdMfg = "(dispozitive generice de interfațare umană)"
 
 [Strings.0419]
-ReactOS               = "Команда ReactOS"
 HID.ClassName         = "Устройства HID (Human Interface Devices)"
 HID.DeviceDesc        = "USB HID-совместимое устройство"
 
@@ -140,7 +139,6 @@ StdMfg                = "(Стандартные HID-устройства)"
 MSMice                = "Microsoft"
 
 [Strings.041f]
-ReactOS               = "ReactOS Takımı"
 HID.ClassName         = "İnsan Arabirimi Aygıtları"
 HID.DeviceDesc        = "USB İnsan Arabirimi Aygıtı"
 
@@ -148,7 +146,6 @@ HID_DEVICE            =  "HID Uyumlu Aygıt"
 StdMfg                = "(Standart İnsan Arabirimi Aygıtları)"
 
 [Strings.0422]
-ReactOS               = "Команда ReactOS"
 HID_DEVICE            =  "HID-сумісний пристрій"
 
 [Strings.0804]
@@ -157,7 +154,6 @@ HID_DEVICE            =  "HID 兼容设备"
 StdMfg                = "(标准人机接口设备)"
 
 [Strings.0816]
-ReactOS               = "Equipa ReactOS"
 HID.ClassName         = "Dispositivos de interface humana"
 HID.DeviceDesc        = "Dispositivos de interface humana USB"
 
diff --git a/media/inf/keyboard.inf b/media/inf/keyboard.inf
index c150e903f31..fc5ccd8235b 100644
--- a/media/inf/keyboard.inf
+++ b/media/inf/keyboard.inf
@@ -99,7 +99,10 @@ LoadOrderGroup = Keyboard Class
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 KeyboardClassName = "Keyboards"
 HID.KeyboardDevice    = "HID-Keyboard"
 StdMfg = "(Standard keyboards)"
@@ -132,7 +135,6 @@ StdMfg = "(Πρότυπα πληκτρολόγια)"
 *PNP0303.DeviceDesc = "IBM PC/AT πληκτρολόγιο"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 KeyboardClassName = "Teclados"
 StdMfg = "(Teclado estándar)"
 LocationOverride = "se conecta al puerto de teclado"
@@ -150,7 +152,6 @@ StdMfg = "(スタンダード キーボード)"
 *PNP0303.DeviceDesc = "IBM PC/AT キーボード"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 KeyboardClassName = "Klawiatury"
 HID.KeyboardDevice    = "Klawiatura HID"
 StdMfg = "(Klawiatury standardowe)"
@@ -163,7 +164,6 @@ StdMfg = "(Teclado padrão)"
 *PNP0303.DeviceDesc = "Teclado IBM PC/AT"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 KeyboardClassName = "Tastaturi"
 HID.KeyboardDevice = "Tastatură-dispozitiv de interfațare umană"
 StdMfg = "(tastatură standard)"
@@ -171,7 +171,6 @@ LocationOverride = "conectat la portul de tastatură"
 *PNP0303.DeviceDesc = "Tastatură IBM PC/AT"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 KeyboardClassName = "Клавиатуры"
 HID.KeyboardDevice    = "Клавиатура HID"
 StdMfg = "(Стандартные клавиатуры)"
@@ -184,7 +183,6 @@ StdMfg = "(Štandardné klávesnice)"
 *PNP0303.DeviceDesc = "Klávesnica IBM PC/AT"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 KeyboardClassName = "Klavyeler"
 HID.KeyboardDevice    = "HID Klavyeler"
 StdMfg = "(Standart Klavyeler)"
@@ -192,7 +190,6 @@ LocationOverride = "klavye girişine takılı"
 *PNP0303.DeviceDesc = "IBM PC/AT Klavye"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 KeyboardClassName = "Клавіатури"
 HID.KeyboardDevice    = "HID-Клавіатура"
 StdMfg = "(Стандартні клавіатури)"
@@ -210,7 +207,6 @@ StdMfg = "(标准键盘)"
 *PNP0303.DeviceDesc = "IBM PC/AT 键盘"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 KeyboardClassName = "Teclados"
 StdMfg = "(Teclado padrão)"
 *PNP0303.DeviceDesc = "Teclado IBM PC/AT"
diff --git a/media/inf/ks.inf b/media/inf/ks.inf
index 535d8529b18..d1cc1a5c41d 100644
--- a/media/inf/ks.inf
+++ b/media/inf/ks.inf
@@ -344,7 +344,9 @@
HKLM,System\CurrentControlSet\Control\MediaInterfaces\{EC529B00-1A1F-11D1-BAD9-0
 
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
 KSSTRING_Clock="{53172480-4791-11D0-A5D6-28DB04C10000}"
 KSSTRING_Quality="{97EBAACB-95BD-11D0-A3EA-00A0C9223196}"
 KSSTRING_Server="{3C0D501A-140B-11D1-B40F-00A0C9223196}"
@@ -951,7 +953,6 @@ AudFName.Video="Video"
 AudFName.Peakmeter="Peakmeter"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 StreamingClass="Dispositivos y filtros de streaming"
 Proxy.FilterDesc="Proxy de filtrado WDM genérico"
 Category_CaptureDevices="Dispositivos de captura de streaming WDM"
@@ -1103,7 +1104,6 @@ AudFName.VideoMute="Silenciar vídeo"
 AudFName.Video="Vídeo"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 StreamingClass="Urządzenia/filtry strumieniowe"
 Proxy.FilterDesc="Standardowy filtr WDM"
 Category_CaptureDevices="Urządzenia nagrywania strumieniowego WDM"
@@ -1256,7 +1256,6 @@ AudFName.Video="Video"
 AudFName.Peakmeter="Analizator"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 StreamingClass="Filtre/dispozitive de redare în flux"
 Proxy.FilterDesc="Proxy filtru WDM generic"
 Category_CaptureDevices="Dispozitive de captură flux WDM"
@@ -1408,8 +1407,6 @@ AudFName.Peakmeter="Vârf-metru"
 
 ; Turkish
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 StreamingClass="Akış Aygıtları/Süzgeçleri"
 Proxy.FilterDesc="Genel WDM Süzgeç Vekil Sunucusu"
 Category_CaptureDevices="WDM Akış Yakalama Aygıtları"
@@ -1562,7 +1559,6 @@ AudFName.Video="Video"
 AudFName.Peakmeter="Tepe Noktası Ölçücüsü"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 StreamingClass="Потокові пристрої/фільтри"
 Proxy.FilterDesc="Стандартний проксі фільтру WDM"
 Category_CaptureDevices="Пристрої захоплення потоку WDM"
@@ -1705,7 +1701,6 @@ AudFName.Video="Відео"
 AudFName.Peakmeter="Замір рівнів"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 StreamingClass="Dispositivos e filtros de streaming"
 Proxy.FilterDesc="Proxy de filtro WDM genérico"
 Category_CaptureDevices="Dispositivos de captura de WDM Streaming"
diff --git a/media/inf/kscaptur.inf b/media/inf/kscaptur.inf
index 9c4d61c8ee4..d83c1858a79 100644
--- a/media/inf/kscaptur.inf
+++ b/media/inf/kscaptur.inf
@@ -245,7 +245,9 @@ HKLM,%RunOnce%,"STREAMIP0",,"rundll32.exe
streamci,StreamingDeviceSetup %StreamI
 HKLM,%RunOnce%,"NDISIP0",,"rundll32.exe streamci,StreamingDeviceSetup
%NdisIP.DeviceId%,NDISIP,%NdisIP.GUID.BDANetInterface%,%17%\ndisip.inf,NdisIP.Reg"
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
 ActiveMovieCategories="CLSID\{da4e3da0-d07d-11d0-bd50-00a0c911ce86}\Instance"
 GUID.TvTuner="{A799A800-A46D-11d0-A18C-00A02401DCD4}"
 GUID.Crossbar="{A799A801-A46D-11d0-A18C-00A02401DCD4}"
@@ -384,7 +386,6 @@ Plugin_ISelector="WDM
Streaming-ISelector-Schnittstellenhandler"
 Plugin_PropertyObject="Knotenschnittstellen-Aggregierungshandler"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 VfWWDMDriverDesc="Dispositivo de captura de vídeo por WDM"
 
 Filter_TVAudio="Audio de TV por WDM"
@@ -407,7 +408,6 @@ Node.Encoder="Codificador"
 Node.Multiplexer="Multiplexador"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 Category_CrossbarDevices="Urządzenia strumieniowe Crossbar WDM"
 Category_TvTunerDevices="Urządzenia strumieniowe odbiornika TV WDM"
 Category_TvAudioDevices="Urządzenia strumieniowe TV Audio WDM"
@@ -456,7 +456,6 @@ Plugin_ISelector="Wtyczka do interfejsu strumienia
ISelectorWDM"
 Plugin_PropertyObject="Node Interfaces-Aggregate handler"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 Category_CrossbarDevices="Dispozitive „crossbar” de flux WDM"
 Category_TvTunerDevices="Dispozitive receptoare TV de flux WDM"
 Category_TvAudioDevices="Dispozitive audio TV de flux WDM"
@@ -505,7 +504,6 @@ Plugin_ISelector="Rutină interfață flux WDM selector
intrare"
 Plugin_PropertyObject="Rutină interfețe nod agregate"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 Category_CrossbarDevices="WDM Akış-Çubuk-Aygıt"
 Category_TvTunerDevices="WDM Akış-TV-Alıcı Aygıtlar"
 Category_TvAudioDevices="WDM Akış-TV-Ses Aygıtları"
@@ -554,7 +552,6 @@ Plugin_ISelector="WDM Akış-ISelector-Arayüz İşleyicisi"
 Plugin_PropertyObject="Bileşen Arayüzler-Öbeklenme İşleyicisi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 Category_CrossbarDevices="Потоково-Перехресний Пристрій WDM"
 Category_TvTunerDevices="Потокові TV-Приймальні Пристрої WDM"
 Category_TvAudioDevices="Потокові TV-Аудіо Пристрої WDM"
diff --git a/media/inf/legcydrv.inf b/media/inf/legcydrv.inf
index 5d81b6c77f5..76cf3d27a24 100644
--- a/media/inf/legcydrv.inf
+++ b/media/inf/legcydrv.inf
@@ -19,7 +19,10 @@ HKR, , EnumPropPages32, 0,
"syssetup.dll,LegacyDriverPropPageProvider"
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 LegacyDriverClassName = "Non-Plug and Play Drivers"
 
 [Strings.0404]
@@ -32,27 +35,21 @@ LegacyDriverClassName = "Zařízení nepodporující Plug and
Play"
 LegacyDriverClassName = "Nicht-PnP Treiber"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 LegacyDriverClassName = "Controladores incompatibles con PnP"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 LegacyDriverClassName = "Sterowniki niezgodne z Plug and Play"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 LegacyDriverClassName = "Modúle pilot de cuplare statică (non-PnP)"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 LegacyDriverClassName = "Драйверы устройств не Plug and Play"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 LegacyDriverClassName = "Tak ve Çalıştır Olmayan Sürücüler"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 LegacyDriverClassName = "Controladores incompativeis com PnP"
 
 [Strings.0C04]
diff --git a/media/inf/machine.inf b/media/inf/machine.inf
index 9d0175cd88a..8934b56d70e 100644
--- a/media/inf/machine.inf
+++ b/media/inf/machine.inf
@@ -163,7 +163,10 @@ LoadOrderGroup = Boot Bus Extender
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 SystemClassName = "System devices"
 
 GenericMfg = "(Generic system devices)"
@@ -378,7 +381,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX
Pentium(R) II CPU σε P
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU σε
PCI-Γέφυρα"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 SystemClassName = "Dispositivos del sistema"
 
 GenericMfg = "(Dispositivos del sistema estándar)"
@@ -506,7 +508,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX
Pentium(R) II CPU to PCI
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI
ブリッジ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 SystemClassName = "Urządzenia systemowe"
 
 GenericMfg = "(Standardowe urządzenia systemowe)"
@@ -588,7 +589,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX
Pentium(R) II Ponte CPU
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II Ponte CPU
- PCI"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 SystemClassName = "Dispozitive de sistem"
 
 GenericMfg = "(dispozitiv generic de sistem)"
@@ -633,7 +633,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Punte Intel 82443BX/ZX/DX
Pentium(R) II CPU
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Punte Intel 82443BX/ZX/DX Pentium(R) II CPU
to PCI"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 SystemClassName = "Системные устройства"
 
 GenericMfg = "(Стандартные системные устройства)"
@@ -723,7 +722,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Most Intel 82443BX/ZX/DX
Pentium(R) II CPU n
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Most Intel 82443BX/ZX/DX Pentium(R) II CPU
na PCI"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 SystemClassName = "Sistem Aygıtları"
 
 GenericMfg = "(Genel Sistem Aygıtları)"
@@ -767,7 +765,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX
Pentium(R) II CPU'dan PC
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II
CPU'dan PCI'ya Köprü"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 SystemClassName = "Системні пристрої"
 
 GenericMfg = "(Стандартні системні пристрої)"
@@ -892,7 +889,6 @@ PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX
Pentium(R) II CPU - PCI
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU - PCI
桥"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 SystemClassName = "Dispositivos do sistema"
 
 GenericMfg = "(Dispositivos do sistema padrão)"
diff --git a/media/inf/monitor.inf b/media/inf/monitor.inf
index d47ad2e6b46..3ccc18c177a 100644
--- a/media/inf/monitor.inf
+++ b/media/inf/monitor.inf
@@ -50,7 +50,10 @@ ServiceBinary = %12%\monitor.sys
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 MonitorClassName = "Monitors"
 
 StdMfg = "(Standard monitor types)"
@@ -72,11 +75,11 @@ PnPMonitor.DeviceDesc = "Plug and Play monitor"
 
 [Strings.0407]
 MonitorClassName = "Monitore"
+
 StdMfg = "(Generische Monitore)"
 PnPMonitor.DeviceDesc = "Plug and Play Monitor"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 MonitorClassName = "Monitores"
 
 StdMfg = "(Monitores genéricos)"
@@ -84,8 +87,6 @@ DefaultMonitor.DeviceDesc = "Monitor predeterminado"
 PnPMonitor.DeviceDesc = "Monitor Plug and Play"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
-
 MonitorClassName = "Monitory"
 
 StdMfg = "(Standardowe typy monitorów)"
@@ -93,21 +94,20 @@ DefaultMonitor.DeviceDesc = "Domyślny monitor"
 PnPMonitor.DeviceDesc = "Monitor Plug and Play"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 MonitorClassName = "Ecrane"
+
 StdMfg = "(ecrane de tip standard)"
 DefaultMonitor.DeviceDesc = "Ecran implicit"
 PnPMonitor.DeviceDesc = "Ecran cuplare dinamică (PnP)"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 MonitorClassName = "Мониторы"
+
 StdMfg = "(Стандартные мониторы)"
 DefaultMonitor.DeviceDesc = "Модуль подключения монитора"
 PnPMonitor.DeviceDesc = "Монитор Plug and Play"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 MonitorClassName = "Monitörler"
 
 StdMfg = "(Standart Monitör Türleri)"
@@ -120,7 +120,6 @@ DefaultMonitor.DeviceDesc = "默认监视器"
 PnPMonitor.DeviceDesc = "即插即用监视器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 MonitorClassName = "Monitores"
 
 StdMfg = "(Monitores genéricos)"
diff --git a/media/inf/msmouse.inf b/media/inf/msmouse.inf
index 3a4fc5af642..b485cb9067b 100644
--- a/media/inf/msmouse.inf
+++ b/media/inf/msmouse.inf
@@ -160,7 +160,10 @@ LoadOrderGroup = Pointer Port
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 MouseClassName = "Mice and other pointing devices"
 LocationOverride = "plugged in to PS/2 mouse port"
 
@@ -285,7 +288,6 @@ HID_MOUSE.DeviceDesc = "Ποντίκι HID"
 *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 MouseClassName = "Ratones y otros dispositivos señaladores"
 LocationOverride = "se conecta al puerto de ratón PS/2"
 
@@ -358,7 +360,6 @@ HID_MOUSE.DeviceDesc = "HID マウス"
 *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 MouseClassName = "Mysz i inne urządzenia wskazujące"
 LocationOverride = "podłączone do portu PS/2 dla myszy"
 
@@ -408,9 +409,9 @@ HID_MOUSE.DeviceDesc = "Mouse interno"
 *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 MouseClassName = "Șoricel și alte dispozitive de indicare"
 LocationOverride = "conectat la portul PS/2 pentru șoricel"
+
 StdMfg = "(șoricel standard)"
 SERIAL_MOUSE.DeviceDesc = "Șoricel serial standard"
 PS2_MOUSE.DeviceDesc = "Șoricel PS/2 standard"
@@ -433,7 +434,6 @@ HID_MOUSE.DeviceDesc = "Șoricel HID"
 *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 MouseClassName = "Мыши и другие указывающие устройства"
 LocationOverride = "подключено в PS/2 порт мыши"
 
@@ -479,7 +479,6 @@ HID_MOUSE.DeviceDesc = "HID myš"
 *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 MouseClassName = "Fare ve Diğer İşaretçi Aygıtları"
 LocationOverride = "PS/2 fare girişine takılı"
 
@@ -505,7 +504,6 @@ HID_MOUSE.DeviceDesc = "HID Fare"
 *nEC1F00.DeviceDesc = "NEC PC-98 Veriyolu Faresi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 MouseClassName = "Миші та інші вказівні пристрої"
 LocationOverride = "приєднано до порту миші PS/2"
 
@@ -575,7 +573,6 @@ HID_MOUSE.DeviceDesc = "HID 鼠标"
 *nEC1F00.DeviceDesc = "NEC PC-98 Bus Mouse"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 MouseClassName = "Ratos e outros dispositivos apontadores"
 LocationOverride = "Ligado à porta PS/2 do rato"
 
diff --git a/media/inf/nettcpip.inf b/media/inf/nettcpip.inf
index 23516a9f4e6..95955d1a4ab 100644
--- a/media/inf/nettcpip.inf
+++ b/media/inf/nettcpip.inf
@@ -293,7 +293,10 @@
HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dnsrslvr.dll"
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 MS_TCPIP.DisplayName = "Internet Protocol Version 4 (TCP/IPv4)"
 DNSCLIENT_NAME = "DNS Client"
 DNSCLIENT_DESC = "Service that caches local DNS queries"
@@ -309,11 +312,7 @@ DHCPCLIENT_NAME = "DHCP 用戶端"
 DHCPCLIENT_DESC = "嘗試從可用的 DHCP 伺服器中自動取得網路設定"
 TCPIP_DEF = "傳輸控制協議 / 互聯網協議"
 
-[Strings.0a]
-ReactOS = "Equipo de ReactOS"
-
 [Strings.040c]
-ReactOS = "Équipe ReactOS"
 MS_TCPIP.DisplayName = "Protocole Internet Version 4 (TCP/IPv4)"
 DNSCLIENT_NAME = "Client DNS"
 DNSCLIENT_DESC = "Service de mise en cache de requêtes DNS locales"
@@ -322,7 +321,6 @@ DHCPCLIENT_DESC = "Obtient les paramètres réseau automatiquement
depuis un ser
 TCPIP_DEF = "Transmission Control Protocol/Internet Protocol"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 MS_TCPIP.DisplayName = "Protokół internetowy w wersji 4 (TCP/IPv4)"
 DNSCLIENT_NAME = "Klient DNS"
 DNSCLIENT_DESC = "Usługa buforująca lokalne zapytania DNS"
@@ -330,11 +328,7 @@ DHCPCLIENT_NAME = "Klient DHCP"
 DHCPCLIENT_DESC = "Próbuje uzyskać ustawienia sieciowe automatycznie z dostępnego
serwera DHCP"
 TCPIP_DEF = "Protokół kontroli transmisji/Protokół internetowy (TCP/IP)"
 
-[Strings.0418]
-ReactOS = "Echipa ReactOS"
-
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 MS_TCPIP.DisplayName = "Протокол Интернета версии 4 (TCP/IPv4)"
 DNSCLIENT_NAME = "Клиент DNS"
 DNSCLIENT_DESC = "Служба кэширования локальных DNS запросов"
@@ -343,7 +337,6 @@ DHCPCLIENT_DESC = "Автоматически получает настройк
 TCPIP_DEF = "Протокол контроля передачи/Протокол Интернета (TCP/IP)"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 MS_TCPIP.DisplayName = "Genel Ağ Protokolü Sürüm 4 (TCP/IPv4)"
 DNSCLIENT_NAME = "DNS İstemcisi"
 DNSCLIENT_DESC = "Yerel DNS sorgularını önbelleğe alan hizmet"
@@ -351,11 +344,7 @@ DHCPCLIENT_NAME = "DHCP İstemcisi"
 DHCPCLIENT_DESC = "Kullanılabilir bir DHCP sunucusundan otomatik olarak ağ
ayarlarını almayı dener"
 TCPIP_DEF = "Aktarım Denetim Protokolü/Genel Ağ Protokolü"
 
-[Strings.0422]
-ReactOS = "Команда ReactOS"
-
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 MS_TCPIP.DisplayName = "Internet Protocol Version 4 (TCP/IPv4)"
 DNSCLIENT_NAME = "DNS Client"
 DNSCLIENT_DESC = "Serviço que armazena em cache consultas DNS locais"
diff --git a/media/inf/ports.inf b/media/inf/ports.inf
index b713470fd68..91e915300c5 100644
--- a/media/inf/ports.inf
+++ b/media/inf/ports.inf
@@ -90,7 +90,10 @@ LoadOrderGroup = PNP Filter
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 PortsClassName = "Serial and parallel ports"
 
 StdMfg = "(Standard ports)"
@@ -118,7 +121,6 @@ StdMfg = "(Standard-Anschlüsse)"
 *PNP0401.DeviceDesc = "ECP Druckeranschluss"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 PortsClassName = "Puertos (COM y LPT)"
 
 StdMfg = "(Puertos estándar)"
@@ -147,7 +149,6 @@ StdMfg = "(スタンダード ポート)"
 *PNP0401.DeviceDesc = "ECP プリンタ ポート"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 PortsClassName = "Porty (COM i LPT)"
 
 StdMfg = "(Standardowe porty)"
@@ -166,8 +167,8 @@ StdMfg = "(Tipos de porta padrão)"
 *PNP0401.DeviceDesc = "Porta de impressora ECP"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 PortsClassName = "Porturi seriale și paralele"
+
 StdMfg = "(port standard)"
 *PNP0500.DeviceDesc = "Port de comunicație serial"
 *PNP0501.DeviceDesc = "Port de comunicație serial"
@@ -175,7 +176,6 @@ StdMfg = "(port standard)"
 *PNP0401.DeviceDesc = "Port de imprimantă ECP"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 PortsClassName = "Порты (COM и LPT)"
 
 StdMfg = "(Стандартные порты)"
@@ -194,7 +194,6 @@ StdMfg = "(Štandardné porty)"
 *PNP0401.DeviceDesc = "ECP tlačový port"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 PortsClassName = "Seri ve Paralel Bağlantı Noktaları"
 
 StdMfg = "(Ölçünlü Girişler)"
@@ -204,7 +203,6 @@ StdMfg = "(Ölçünlü Girişler)"
 *PNP0401.DeviceDesc = "ECP Yazıcı Bağlantı Noktası"
 
 [Strings.0422]
-ReactOS = "Команди ReactOS"
 PortsClassName = "Порти (COM і LPT)"
 
 StdMfg = "(Стандартні порти)"
@@ -230,7 +228,6 @@ StdMfg = "(标准端口)"
 *PNP0401.DeviceDesc = "ECP 打印机端口"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 PortsClassName = "Portas (COM & LPT)"
 
 StdMfg = "(Tipos de porta padrão)"
diff --git a/media/inf/scsi.inf b/media/inf/scsi.inf
index 4545208195b..3871cd4c0c3 100644
--- a/media/inf/scsi.inf
+++ b/media/inf/scsi.inf
@@ -70,7 +70,10 @@ LoadOrderGroup = SCSI Miniport
 ;--------------------------------- Strings ---------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 SCSIClassName = "SCSI and RAID Controllers"
 
 GenericMfg = "(Standard SCSI and RAID controllers)"
@@ -96,7 +99,6 @@ SCSIClassName = "SCSI und RAID Controller"
 GenericMfg = "(Standard SCSI und RAID Controller)"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 SCSIClassName = "Controladores SCSI y RAID"
 
 GenericMfg = "(Controladores estándar SCSI y RAID)"
@@ -115,8 +117,8 @@ GenericMfg = "(スタンダード SCSI および RAID コントローラ)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI コントローラ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 SCSIClassName = "Kontrolery SCSI i RAID"
+
 GenericMfg = "(Standardowe kontrolery SCSI i RAID)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "Kontroler SCSI BusLogic"
 
@@ -127,13 +129,12 @@ GenericMfg = "(Controladores SCSI e RAID padrão)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "Controlador SCSI BusLogic"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 SCSIClassName = "Dispozitive de control SCSI și RAID"
+
 GenericMfg = "(dispozitiv standard de control SCSI și RAID)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "Dispozitiv de control SCSI BusLogic"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 SCSIClassName = "SCSI и RAID контроллеры"
 
 GenericMfg = "(Стандартные SCSI и RAID контроллеры)"
@@ -147,7 +148,6 @@ GenericMfg = "(Štandardné SCSI a RAID radiče)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI radič"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 SCSIClassName = "SCSI ve RAID Denetleyicileri"
 
 GenericMfg = "(Standart SCSI ve RAID Denetleyicileri)"
@@ -155,8 +155,8 @@ GEN_SCSIADAPTER.DeviceDesc = "SCSI/RAID Ana Denetleyicisi"
 PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI Denetleyicisi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 SCSIClassName = "SCSI і RAID контроллери"
+
 GenericMfg = "(Стандартні SCSI і RAID контроллери)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "Контроллер BusLogic SCSI"
 
@@ -171,7 +171,6 @@ GenericMfg = "(标准 SCSI / RAID 控制器)"
 PCI\VEN_104B&CC_0100.DeviceDesc = "BusLogic SCSI 控制器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 SCSIClassName = "Controladores SCSI e RAID"
 
 GenericMfg = "(Controladores SCSI e RAID padrão)"
diff --git a/media/inf/unknown.inf b/media/inf/unknown.inf
index edbb96c551f..a54fb795129 100644
--- a/media/inf/unknown.inf
+++ b/media/inf/unknown.inf
@@ -17,7 +17,10 @@ HKR, , Icon,           0, "-18"
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 UnknownClassName = "Other Devices"
 
 [Strings.0404]
@@ -30,39 +33,30 @@ UnknownClassName = "Ostatní zařízení"
 UnknownClassName = "Andere Geräte"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 UnknownClassName = "Otros dispositivos"
 
 [Strings.040D]
-ReactOS = "צוות ReactOS"
 UnknownClassName = "התקנים אחרים"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 UnknownClassName = "Nieznane urządzenie"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 UnknownClassName = "Alte dispozitive"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 UnknownClassName = "Другие устройства"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 UnknownClassName = "Diğer Aygıtlar"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 UnknownClassName = "Інші пристрої"
 
 [Strings.0804]
-ReactOS = "ReactOS Team"
 UnknownClassName = "其它设备"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 UnknownClassName = "Outros dispositivos"
 
 [Strings.0C04]
diff --git a/media/inf/usb.inf b/media/inf/usb.inf
index 91eb5d9ace0..047ca493f08 100644
--- a/media/inf/usb.inf
+++ b/media/inf/usb.inf
@@ -58,8 +58,10 @@ LoadOrderGroup = Base
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+; Localizable
 GenericMfg = "(Generic USB Hubs)"
 USB\COMPOSITE.DeviceDesc = "USB Composite Device"
 USB\CLASS_09.DeviceDesc = "Generic USB Hub"
@@ -96,7 +98,6 @@ GenericMfg = "(標準 USBハブ)"
 USB\CLASS_09.DeviceDesc = "標準 USBハブ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 GenericMfg = "(Standardowy koncentrator USB)"
 USB\COMPOSITE.DeviceDesc = "Urządzenie kompozytowe USB"
 USB\CLASS_09.DeviceDesc = "Standardowy koncentrator USB"
@@ -106,13 +107,11 @@ GenericMfg = "(Hub USB padrão)"
 USB\CLASS_09.DeviceDesc = "Hub USB padrão"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 GenericMfg = "(cuplatori generici USB)"
 USB\COMPOSITE.DeviceDesc = "Dispozitiv USB compus"
 USB\CLASS_09.DeviceDesc = "Cuplator USB generic"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 GenericMfg = "(Стандартный USB хаб)"
 USB\COMPOSITE.DeviceDesc = "USB составное устройство"
 USB\CLASS_09.DeviceDesc = "Стандартный USB хаб"
@@ -122,14 +121,11 @@ GenericMfg = "(Generický rozbočovač USB)"
 USB\CLASS_09.DeviceDesc = "Generický rozbočovač USB"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 GenericMfg = "(Genel USB Göbekleri)"
 USB\COMPOSITE.DeviceDesc = "USB Bileşik Aygıt"
 USB\CLASS_09.DeviceDesc = "Genel USB Göbeği"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 GenericMfg = "(Стандартні USB-хаби)"
 USB\COMPOSITE.DeviceDesc = "Композитний пристрій USB"
 USB\CLASS_09.DeviceDesc = "Стандартний USB-хаб"
@@ -144,7 +140,6 @@ USB\COMPOSITE.DeviceDesc = "USB 聚合设备"
 USB\CLASS_09.DeviceDesc = "通用 USB 集线器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 GenericMfg = "(Hub USB padrão)"
 USB\CLASS_09.DeviceDesc = "Hub USB padrão"
 
diff --git a/media/inf/usbport.inf b/media/inf/usbport.inf
index dacedad507c..bc70c5f02c2 100644
--- a/media/inf/usbport.inf
+++ b/media/inf/usbport.inf
@@ -116,7 +116,10 @@ LoadOrderGroup = Base
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 USBClassName = "USB Controllers"
 
 GenericMfg = "(Generic USB devices)"
@@ -164,7 +167,6 @@ PCI\CC_0C0320.DeviceDesc = "EHCI USB-Controller"
 USB\ROOT_HUB.DeviceDesc = "Root Hub"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 USBClassName = "Controladores USB"
 
 GenericMfg = "(Dispositivo USB estándar)"
@@ -200,7 +202,6 @@ PCI\CC_0C0320.DeviceDesc = "EHCI USB コントローラ"
 USB\ROOT_HUB.DeviceDesc = "ルート ハブ"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 USBClassName = "Kontrolery USB"
 
 GenericMfg = "(Standardowe urządzenia USB)"
@@ -227,19 +228,19 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc =
"Controlador USB Intel 82371SB PIIX
 PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Controlador USB Intel
82371AB/EB/MB PIIX4"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 USBClassName = "Dispozitive de control USB"
+
 GenericMfg = "(dispozitive generice de control USB)"
 PCI\CC_0C0300.DeviceDesc = "Dispozitive de control USB UHCI"
 PCI\CC_0C0310.DeviceDesc = "Dispozitive de control USB OHCI"
 PCI\CC_0C0320.DeviceDesc = "Dispozitive de control USB EHCI"
 USB\ROOT_HUB.DeviceDesc = "Cuplator rădăcină"
+
 IntelMfg = "Intel"
 PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Dispozitiv de control USB
Intel 82371SB PIIX3"
 PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Dispozitiv de contorl USB
Intel 82371AB/EB/MB PIIX4"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 USBClassName = "Контроллеры USB"
 
 GenericMfg = "(Стандартные устройства USB)"
@@ -276,7 +277,6 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel
82371SB PIIX3 USB valdiklis"
 PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB
valdiklis"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 USBClassName = "USB Denetleyicileri"
 
 GenericMfg = "(Genel USB Aygıtları)"
@@ -290,7 +290,6 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel
82371SB PIIX3 USB Denetleyic
 PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB
Denetleyicisi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 USBClassName = "Контроллери USB"
 
 GenericMfg = "(Стандартні пристрої USB)"
@@ -313,7 +312,6 @@ PCI\VEN_8086&DEV_7020&CC_0C0300.DeviceDesc = "Intel
82371SB PIIX3 USB 控制器"
 PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB
控制器"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 USBClassName = "Controladores de barramento série universal (USB)"
 
 GenericMfg = "(Dispositivo USB padrão)"
diff --git a/media/inf/volume.inf b/media/inf/volume.inf
index b243c324264..5db870c5248 100644
--- a/media/inf/volume.inf
+++ b/media/inf/volume.inf
@@ -39,7 +39,10 @@ HKR, , SilentInstall,   0, "1"
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 VolumeClassName = "Storage volumes"
 GenericMfg = "(Generic storage volumes)"
 STORAGE\Volume.DeviceDesc = "Storage volume"
@@ -50,19 +53,16 @@ GenericMfg = "（標準存放磁碟區）"
 STORAGE\Volume.DeviceDesc = "存放磁碟區"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 VolumeClassName = "Тома хранения"
 GenericMfg = "(Стандартные тома хранения)"
 STORAGE\Volume.DeviceDesc = "Том хранения"
 
 [Strings.0816]
-ReactOS = "Equipa ReactOS"
 VolumeClassName = "Volumes de armazenamento"
 GenericMfg = "(Volumes de armazenamento genérico)"
 STORAGE\Volume.DeviceDesc = "Volume de armazenamento"
 
 [Strings.0804]
-ReactOS = "ReactOS Team"
 VolumeClassName = "存储卷"
 GenericMfg = "（通用存储卷）"
 STORAGE\Volume.DeviceDesc = "存储卷"
diff --git a/media/inf/wmiacpi.inf b/media/inf/wmiacpi.inf
index c61d44d2ec6..e0f18995324 100644
--- a/media/inf/wmiacpi.inf
+++ b/media/inf/wmiacpi.inf
@@ -32,7 +32,10 @@ AddService = , 0x00000002
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+
+; Localizable
 GenericMfg = "(Generic system devices)"
 *PNP0C14.DeviceDesc = "WMI for ACPI"
 
@@ -48,22 +51,18 @@ GenericMfg = "(Generische Systemgeräte)"
 *PNP0C14.DeviceDesc = "WMI für ACPI"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 GenericMfg = "(Standardowe urządzenia systemowe)"
 *PNP0C14.DeviceDesc = "WMI dla ACPI"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 GenericMfg = "(dispozitive generice de sistem)"
 *PNP0C14.DeviceDesc = "WMI pentru ACPI"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
 GenericMfg = "(Универсальные системные устройства)"
 *PNP0C14.DeviceDesc = "WMI для ACPI"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
 GenericMfg = "(Genel Sistem Aygıtları)"
 *PNP0C14.DeviceDesc = "ACPI için WMI"
 
@@ -72,7 +71,6 @@ GenericMfg = "(通用系统设备)"
 *PNP0C14.DeviceDesc = "ACPI 的 WMI"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 GenericMfg = "(Dispositivos genéricos del sistema)"
 *PNP0C14.DeviceDesc = "WMI para ACPI"
 
diff --git a/modules/rosapps/drivers/green/green.inf
b/modules/rosapps/drivers/green/green.inf
index 2b0b4d63998..c6a37e0870e 100644
--- a/modules/rosapps/drivers/green/green.inf
+++ b/modules/rosapps/drivers/green/green.inf
@@ -87,10 +87,11 @@ AddService = green, 0x00000002, green_Service_Inst
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
+ReactOSMfg = "(ReactOS Project)"
 
+; Localizable
 GREEN.DriverDesc = "VT100 server emulator"
-
-ReactOSMfg = "(ReactOS Team)"
 KEYBOARD.DeviceDesc = "Keyboard for remote console"
 SCREEN.DeviceDesc = "Screen for remote console"
diff --git a/win32ss/drivers/miniport/pc98vid/pc98disp.inf
b/win32ss/drivers/miniport/pc98vid/pc98disp.inf
index d67f9882517..42a8f3fd84a 100644
--- a/win32ss/drivers/miniport/pc98vid/pc98disp.inf
+++ b/win32ss/drivers/miniport/pc98vid/pc98disp.inf
@@ -50,13 +50,13 @@ HKR,, VideoDebugLevel,         0x00010001, 0
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
-
+; Non-localizable
+ReactOS = "ReactOS Project"
 NecMfg = "NEC"
+
+; Localizable
 PCI\VEN_1033&DEV_0009.DeviceDesc = "NEC PCI to Core-Graph Bridge"
 pc98vid.DeviceDesc = "Graphic controller for PC-9821"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
-
 pc98vid.DeviceDesc = "Графический контроллер для PC-9821"
diff --git a/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf
b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf
index c103ee304c3..a9a4c3d3913 100644
--- a/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf
+++ b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf
@@ -47,38 +47,32 @@ HKR,,InstalledDisplayDrivers,0x00010000,framebuf
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]
-ReactOS = "ReactOS Team"
+; Non-localizable
+ReactOS = "ReactOS Project"
 
+; Localizable
 nVidiaMfg = "nVidia Corporation"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Graphics Processing Unit"
 
 [Strings.0a]
-ReactOS = "Equipo de ReactOS"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Unidad de procesamiento de gráficos de Xbox
NV2A"
 
 [Strings.0415]
-ReactOS = "Zespół ReactOS"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Procesor graficzny Xbox NV2A"
 
 [Strings.0418]
-ReactOS = "Echipa ReactOS"
 nVidiaMfg = "Corporația nVidia"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Unitate de procesare grafică Xbox
NV2A"
 
 [Strings.0419]
-ReactOS = "Команда ReactOS"
-
 nVidiaMfg = "Корпорация nVidia"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Графический процессор NV2A Xbox"
 
 [Strings.041f]
-ReactOS = "ReactOS Takımı"
-
 nVidiaMfg = "nVidia Ortaklığı"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "NV2A Xbox Çizge İşleme Birimi"
 
 [Strings.0422]
-ReactOS = "Команда ReactOS"
 nVidiaMfg = "Корпорація nVidia"
 PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Графічний процесор NV2A Xbox"