[ros-diffs] [reactos] 01/02: [SYSSETUP] Add placeholders for IDC_LOCALETEXT and IDC_LAYOUTTEXT

[Stanislav Motylkov]

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

commit 17cb1e1a0414cb59e6043f1656a45033590743d1
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Thu Oct 14 19:34:37 2021 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Sun Oct 24 00:12:18 2021 +0300

    [SYSSETUP] Add placeholders for IDC_LOCALETEXT and IDC_LAYOUTTEXT
    
    The window initialization handler code should update these properly,
    but for now just put empty strings there until it's implemented.
    
    This makes reviewing dialog layout easier in visual resource editors
    like Resource Hacker and others, so the translation maintenance takes
    much less time.
    
    We already use this technique in some other modules like sysdm and zipfldr.
    
    Spotted by Can Taşan. Fix suggested by Thomas Faber.
    
    Additionally:
    - Fix position of some elements to avoid overlapping
    - Fix some headers according to the latest coding style
---
 dll/win32/syssetup/lang/bg-BG.rc |  4 ++--
 dll/win32/syssetup/lang/cs-CZ.rc | 14 ++++++++------
 dll/win32/syssetup/lang/da-DK.rc |  4 ++--
 dll/win32/syssetup/lang/de-DE.rc |  4 ++--
 dll/win32/syssetup/lang/el-GR.rc |  4 ++--
 dll/win32/syssetup/lang/en-GB.rc |  4 ++--
 dll/win32/syssetup/lang/en-US.rc |  4 ++--
 dll/win32/syssetup/lang/es-ES.rc | 16 ++++++++--------
 dll/win32/syssetup/lang/et-EE.rc |  4 ++--
 dll/win32/syssetup/lang/fi-FI.rc |  4 ++--
 dll/win32/syssetup/lang/fr-FR.rc |  4 ++--
 dll/win32/syssetup/lang/he-IL.rc |  4 ++--
 dll/win32/syssetup/lang/hi-IN.rc | 14 +++++++-------
 dll/win32/syssetup/lang/hu-HU.rc |  3 ++-
 dll/win32/syssetup/lang/id-ID.rc |  4 ++--
 dll/win32/syssetup/lang/it-IT.rc |  6 +++---
 dll/win32/syssetup/lang/ja-JP.rc |  4 ++--
 dll/win32/syssetup/lang/lt-LT.rc |  4 ++--
 dll/win32/syssetup/lang/nl-NL.rc |  4 ++--
 dll/win32/syssetup/lang/no-NO.rc |  4 ++--
 dll/win32/syssetup/lang/pl-PL.rc |  6 +++---
 dll/win32/syssetup/lang/pt-BR.rc |  6 +++---
 dll/win32/syssetup/lang/pt-PT.rc |  6 +++---
 dll/win32/syssetup/lang/ro-RO.rc | 15 +++++++--------
 dll/win32/syssetup/lang/ru-RU.rc | 13 +++++++++----
 dll/win32/syssetup/lang/sk-SK.rc | 13 +++++++------
 dll/win32/syssetup/lang/sq-AL.rc |  6 +++---
 dll/win32/syssetup/lang/sv-SE.rc |  4 ++--
 dll/win32/syssetup/lang/th-TH.rc |  4 ++--
 dll/win32/syssetup/lang/tr-TR.rc | 13 ++++++++++---
 dll/win32/syssetup/lang/uk-UA.rc | 15 ++++++++-------
 dll/win32/syssetup/lang/zh-CN.rc | 11 ++++++++---
 dll/win32/syssetup/lang/zh-TW.rc | 23 ++---------------------
 dll/win32/syssetup/wizard.c      | 11 +++++++++++
 34 files changed, 136 insertions(+), 123 deletions(-)

diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 80095dae23c..01cd32bf4a7 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Местната стойност на уредбата трябва да отговаря на езика на
приложенията, които ще използвате. Местната стойност определя как се изобразават паричните
стойности и датите.", IDC_STATIC, 53, 2, 253, 26
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "За промяна на уредбените или местните настройки, натиснете
„Нагласяване“.", IDC_STATIC, 53, 60, 184, 16
     PUSHBUTTON "&Нагласяване...", IDC_CUSTOMLOCALE, 245, 57, 55, 14
     LTEXT "Клавиатурната подредба определя знаците, появяващи се при писане.",
IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "За смяна на клавиатурната подредба, натиснете „Нагласяване“.",
IDC_STATIC, 53, 126, 184, 16
     PUSHBUTTON "На&гласяване...", IDC_CUSTOMLAYOUT, 245, 122, 55, 14
 END
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index cfa8de1ba10..05ab8b4f1bd 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -1,7 +1,9 @@
-/* FILE:       dll/win32/syssetup/lang/cs-CZ.rc
- * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2014-04-21
- * THANKS TO:  Filip Navara and Kamil Hornicek, who translated major part of this file
+/*
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Czech resource file
+ * TRANSLATORS: Copyright 2008-2014 Radek Liška aka Black_Fox
<radekliska(a)gmail.com>
+ *              Copyright 2014-2017 Kamil Hornicek <kamil.hornicek(a)reactos.org>
  */
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -80,11 +82,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Lokalizace systému by měla souhlasit s jazykem aplikací, které chcete
používat. Localizace určí, jak budou zobrazena čísla, měny a kalendářní data.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "Pro změnu lokalizace systému klikněte na Změnit.", IDC_STATIC, 53,
60, 184, 8
     PUSHBUTTON "&Změnit...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Rozložení kláves určí znaky, které se zobrazí, když píšete.",
IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Pro změnu rozložení kláves, klikněte na Změnit.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "Z&měnit...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index e28cb72f45a..49823fd973e 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -93,11 +93,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index e7eaf437d63..0626f5a6278 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Die Spracheinstellungen des Systems sollten mit der Sprache der
Anwendungen, die Sie nutzen wollen übereinstimmen. Die Nutzereinstellungen geben vor, wie
Zahlen, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 30
-    LTEXT "", IDC_LOCALETEXT, 54, 34, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16
     LTEXT "Klicken Sie auf Einstellen, um die regionalen Einstellungen zu
ändern.", IDC_STATIC, 53, 57, 188, 16
     PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Das Tastaturlayout gibt vor, welches Zeichen ein Tastendruck
bewirkt.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Klicken Sie auf Einstellen, um das Tastaturlayout zu ändern.",
IDC_STATIC, 53, 122, 188, 16
     PUSHBUTTON "Eins&tellen...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index 3c3a7fdf9f5..9d27c1da0bd 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Οι τοπικές ρυθμισεις πρέπει να ταιριάζουν με τη γλώσσα των εφαρμογών  που
θέλετε να χρησιμοποιήσετε. Επίσης ελέγχουν τον τρόπο  με τον οποίο θα εμφανίζονται οι
αριθμοί, τα νομίσματα και οι ημερομηνίες.", IDC_STATIC, 53, 7, 253, 31
-    LTEXT "", IDC_LOCALETEXT, 53, 31, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "Για να αλλάξετε τις τοπικές ρυθμίσεις, πατήστε το κουμπί
'Προσαρμογή'.", IDC_STATIC, 53, 57, 184, 16
     PUSHBUTTON "&Προσαρμογή...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Η διάταξη πληκτρολογίου έλέγχει τους χαρακτήρες που θα εμφανίζονται καθώς
πληκτρολογείτε.", IDC_STATIC, 53, 86, 253, 20
-    LTEXT "", IDC_LAYOUTTEXT, 53, 102, 253, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 253, 16
     LTEXT "Για να αλλάξετε τη διάταξη του πληκτρολογίου, πατήστε το κουμπί
'Προσαρμογή'.", IDC_STATIC, 53, 122, 184, 16
     PUSHBUTTON "Π&ροσαρμογή...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc
index 6eb39517643..c8126ad911c 100644
--- a/dll/win32/syssetup/lang/en-GB.rc
+++ b/dll/win32/syssetup/lang/en-GB.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customise.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customise...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customise.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomise...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index c13f9fb9a8e..bd93b61cefb 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -93,11 +93,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index 9f8b03c48b2..ee6366d8656 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -1,10 +1,10 @@
 /*
- * PROJECT:     ReactOS Win32 Setup
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * PURPOSE:     Spanish locale file
- * COPYRIGHT:   2014 Ismael Ferreras Morezuelas
- *              2018 Julio Carchi Ruiz
- *              2020 Julen Urizar Compains
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Spanish resource file
+ * TRANSLATORS: Copyright 2014 Ismael Ferreras Morezuelas
<swyterzone+ros(a)gmail.com>
+ *              Copyright 2018 Julio Carchi Ruiz <contacto(a)julcar.info.tm>
+ *              Copyright 2020 Julen Urizar Compains <julenuri(a)hotmail.com>
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -83,11 +83,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Las opciones regionales y de idioma permiten configurar la forma en la
que se representan fechas, números, monedas y horas. También permite compatibilizar con
otros idiomas y cambiar los ajustes de ubicación.", IDC_STATIC, 53, 6, 253, 30
-    LTEXT "", IDC_LOCALETEXT, 53, 34, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16
     LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC,
53, 60, 184, 8
     PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "La distribución del teclado determina el caracter que se muestra al
presionar cada tecla.", IDC_STATIC, 53, 86, 253, 32
-    LTEXT "", IDC_LAYOUTTEXT, 53, 109, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 109, 250, 16
     LTEXT "Para cambiar la distribución del teclado, pulse Modificar.",
IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index ba0990719c1..9c644328ec7 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Süsteemi lokaat peaks olema ühtiv nende programmide keelega, mida soovid
kasutada. Kasutaja lokaat määrab, kuidas näidatakse numbreid, valuutat ja kuupäeva.",
IDC_STATIC, 53, 7, 253, 24
-    LTEXT "", IDC_LOCALETEXT, 53, 31, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "Süsteemi või kasutaja lokaadi muutmiseks vajutage Täpsusta.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "Tä&psusta...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "Klaviatuuriasetus määrab tähemärgid, mis klaviatuuril kirjutades
ilmuvad.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Klaviatuuriasetuse muutmiseks vajuta Täp&susta.", IDC_STATIC,
53, 126, 184, 8
     PUSHBUTTON "Täp&susta...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index 5012886106f..7ae61fcc45f 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -93,11 +93,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc
index 24af64425c3..c57acfb5b7c 100644
--- a/dll/win32/syssetup/lang/fr-FR.rc
+++ b/dll/win32/syssetup/lang/fr-FR.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "La localisation système correspond à la langue souhaitée pour les
applications. Elle contrôle la manière dont les nombres, monnaies et dates sont
affichés.", IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "Pour changer la localisation système, cliquez sur Modifier.",
IDC_STATIC, 53, 60, 184, 8
     PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "La configuration clavier contrôle la saisie des touches quand vous
tapez.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Pour changer la configuration clavier, cliquez sur Modifier.",
IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "M&odifier...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index 908c2f0019b..58c659779ee 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index 149cb0752db..4a022b49593 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -1,8 +1,8 @@
 /*
- * PROJECT:     SYSSETUP Hindi Translation
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
- * PURPOSE:     Hindi translation of SYSSETUP
- * COPYRIGHT:   Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com)
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Hindi resource file
+ * TRANSLATORS: Copyright 2019 Arnav Bhatt <arnavbhatt2004(a)gmail.com>
  */
 
 LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA
@@ -80,12 +80,12 @@ CAPTION "रिऐक्ट ओएस सेटअप"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
-    LTEXT "सिस्टम लोकेल को उन एप्लिकेशन की भाषा से मेल खाना चाहिए जिनका आप उपयोग
करना चाहते हैं। उपयोगकर्ता का स्थान नियंत्रित करता है कि संख्याएँ, मुद्राएँ और दिनांक कैसे
दिखाई देते हैं।", IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "सिस्टम लोकेल को उन एप्लिकेशन की भाषा से मेल खाना चाहिए जिनका आप उपयोग
करना चाहते हैं। उपयोगकर्ता का स्थान नियंत्रित करता है कि संख्याएँ, मुद्राएँ और दिनांक कैसे
दिखाई देते हैं।", IDC_STATIC, 53, 7, 253, 25
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "सिस्टम या उपयोगकर्ता लोकेल सेटिंग बदलने के लिए, अनुकूलित करें पर क्लिक
करें।", IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "कीबोर्ड लेआउट आपके द्वारा टाइप किए जाने पर दिखाई देने वाले अक्षरों को
नियंत्रित करता है।", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "कीबोर्ड लेआउट बदलने के लिए, अनुकूलित करें पर क्लिक करें।",
IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc
index 7f7fb4f20c3..250f054421b 100644
--- a/dll/win32/syssetup/lang/hu-HU.rc
+++ b/dll/win32/syssetup/lang/hu-HU.rc
@@ -74,10 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "A rendszer területi beállításait érdemes a használni kívánt nyelvhez
igazítani.\nA felhasználói területi beállítások határozzák meg hogy a számok, pénznemek és
dátumok hogyan jelennek meg.", IDC_STATIC, 53, 7, 253, 24
-    LTEXT "", IDC_LOCALETEXT, 53, 35, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 35, 250, 16
     LTEXT "A rendszer vagy felhasználói területi beállítások megváltoztatásához
kattintson a Testreszabás gombra.", IDC_STATIC, 53, 56, 184, 16
     PUSHBUTTON "Te&streszabás...", IDC_CUSTOMLOCALE, 245, 57, 60, 14
     LTEXT "A billentyűzetkiosztás határozza meg a karaktereket,\namelyek megjelennek
gépeléskor.", IDC_STATIC, 53, 86, 253, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 102, 250, 16
     LTEXT "A billentyűzetkiosztás megváltoztatásához kattintson\na Testreszabás
gombra.", IDC_STATIC, 53, 116, 230, 16
     PUSHBUTTON "Test&reszabás...", IDC_CUSTOMLAYOUT, 245, 122, 60, 14
 END
diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc
index ff848529a8b..918339d2209 100644
--- a/dll/win32/syssetup/lang/id-ID.rc
+++ b/dll/win32/syssetup/lang/id-ID.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Bahasa sistem lokal harus sama dengan aplikasi yang ingin anda gunakan.
Pengguna lokal mengontrol tampilan angka, kurs, dan tanggal.", IDC_STATIC, 53, 7,
253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "Untuk mengubah setelan lokal sistem atau pengguna, klik Sesuaikan.",
IDC_STATIC, 53, 60, 184, 16
     PUSHBUTTON "&Sesuaikan...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Tata letak papan ketik mengontrol tampilan karakter yang muncul ketika
anda ketik.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Untuk mengubah tata letak papan ketik, klik Sesuaikan.", IDC_STATIC,
53, 126, 184, 8
     PUSHBUTTON "S&esuaikan...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index 85d6b2ce29a..e331653350c 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Le impostazioni linguistiche del sistema devono coincidere con la lingua
degli applicativi che si desidera usare. Le impostazioni linguistiche dell'utente
stabiliscono come appaiono i numeri, i valori monetari e le date.", IDC_STATIC, 56,
7, 253, 26
-    LTEXT "", IDC_LOCALETEXT, 56, 35, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 56, 35, 250, 16
     LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente,
selezionare Personalizza.", IDC_STATIC, 20, 55, 184, 16
     PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 240, 55, 60, 16
-    LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si
preme un tasto.", IDC_STATIC, 20, 86, 253, 16
-    LTEXT "", IDC_LAYOUTTEXT, 20, 110, 250, 10
+    LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si
preme un tasto.", IDC_STATIC, 20, 80, 253, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 20, 104, 250, 16
     LTEXT "Per cambiare il formato della tastiera, selezionare Personalizza.",
IDC_STATIC, 20, 120, 184, 16
     PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 240, 120, 60, 16
 END
diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index 82859a3b927..f3299fd34bb 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -74,11 +74,11 @@ FONT 9, "MS UI Gothic"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "システムのロケールを、アプリケーションで使用したい言語に設定して下さい。ユーザー
ロケールは、数値、通貨、日付の表示方法を制御します。", IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "システム、ユーザー ロケール設定変更には [カスタマイズ] をクリックします。", IDC_STATIC, 53, 50, 166,
25
     PUSHBUTTON "カスタマイズ(&C)...", IDC_CUSTOMLOCALE, 220, 52, 80, 14
     LTEXT "キーボード レイアウトは、キーを押したときにどの文字が入力されるかを制御します。", IDC_STATIC, 53, 81, 253,
20
-    LTEXT "", IDC_LAYOUTTEXT, 53, 106, 250, 14
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "キーボード レイアウト変更には [カスタマイズ] をクリックします。", IDC_STATIC, 53, 120, 166, 25
     PUSHBUTTON "カスタマイズ(&U)...", IDC_CUSTOMLAYOUT, 220, 122, 80, 14
 END
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index 9a7723ea847..d224001fdda 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -93,11 +93,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index 9d0fb04e0dd..7bfd5a0c99d 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index ac48f213528..8a4339656f1 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -74,11 +74,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Systemets språk og region burde samsvare med språket på programmene du
vil bruke. Innstillingene for språk og region kontrollerer hvordan tall, valutaer, og dato
vises.", IDC_STATIC, 55, 7, 259, 24
-    LTEXT "", IDC_LOCALETEXT, 53, 32, 250, 18
+    LTEXT "%s", IDC_LOCALETEXT, 53, 32, 250, 16
     LTEXT "For å forandre systemets språk og region instilling, Trykk på
Tilpass.", IDC_STATIC, 53, 60, 184, 8
     PUSHBUTTON "&Tilpass...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Tastatur oppsettet kontrollerer karakterene som kommer opp når du
trykker.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "For å forandre tastatur oppsettet, trykk på Tilpass.", IDC_STATIC,
53, 126, 184, 8
     PUSHBUTTON "T&ilpass...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc
index 9c26f169236..1636f569927 100644
--- a/dll/win32/syssetup/lang/pl-PL.rc
+++ b/dll/win32/syssetup/lang/pl-PL.rc
@@ -73,12 +73,12 @@ CAPTION "Instalator systemu ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
-    LTEXT "Lokalizacja systemu powinna być zgodna (językowo) z aplikacjami, których
planujesz używać. Lokalizacja odpowiada również za wyświetlanie danych, liczb i
walut.", IDC_STATIC, 53, 7, 238, 28
-    LTEXT "", IDC_LOCALETEXT, 53, 32, 250, 16
+    LTEXT "Lokalizacja systemu powinna być zgodna (językowo) z aplikacjami, których
planujesz używać. Lokalizacja odpowiada również za wyświetlanie danych, liczb i
walut.", IDC_STATIC, 53, 7, 238, 25
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "By zmienić lokalizację systemu, kliknij przycisk Dostosuj.",
IDC_STATIC, 53, 60, 184, 8
     PUSHBUTTON "&Dostosuj..", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Układ klawiatury decyduje o przyporządkowaniu znaków pod klawisze.",
IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Aby zmienić układ klawiatury, kliknij przycisk Dostosuj.",
IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "Do&stosuj...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index c518171efac..a71549d3057 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -73,12 +73,12 @@ CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
-    LTEXT "A localidade do sistema deve coincidir com o idioma das aplicações que
você quer utilizar. A localidade de usuário controla como números, moeda e datas
aparecem.", IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "A localidade do sistema deve coincidir com o idioma das aplicações que
você quer utilizar. A localidade de usuário controla como números, moeda e datas
aparecem.", IDC_STATIC, 53, 7, 253, 25
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "Para alterar a localidade de sistema ou usuário, clique
Personalizar.", IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Personalizar...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "O layout do teclado controla os caracteres que aparecem quando você
digita.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Para alterar o layout do teclado, clique Personalizar.", IDC_STATIC,
53, 126, 184, 8
     PUSHBUTTON "P&ersonalizar...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc
index f6060d968ca..9dc33e265ee 100644
--- a/dll/win32/syssetup/lang/pt-PT.rc
+++ b/dll/win32/syssetup/lang/pt-PT.rc
@@ -73,12 +73,12 @@ CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
-    LTEXT "A localização do sistema deve coincidir com o idioma das aplicações que
quer utilizar. As informações regionais controlam o formato dos números, unidade
monetária, data e hora.", IDC_STATIC, 50, 7, 253, 35
-    LTEXT "", IDC_LOCALETEXT, 50, 29, 250, 16
+    LTEXT "A localização do sistema deve coincidir com o idioma das aplicações que
quer utilizar. As informações regionais controlam o formato dos números, unidade
monetária, data e hora.", IDC_STATIC, 50, 7, 253, 25
+    LTEXT "%s", IDC_LOCALETEXT, 50, 36, 250, 16
     LTEXT "Para alterar a localização do sistema, clique em Personalizar.",
IDC_STATIC, 50, 60, 196, 8
     PUSHBUTTON "&Personalizar...", IDC_CUSTOMLOCALE, 245, 57, 55, 14
     LTEXT "O tipo de teclado controla os caracteres que aparecem quando
digita.", IDC_STATIC, 50, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 50, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 50, 100, 250, 16
     LTEXT "Para alterar o tipo do teclado, clique em Personalizar.",
IDC_STATIC, 50, 126, 184, 8
     PUSHBUTTON "P&ersonalizar...", IDC_CUSTOMLAYOUT, 245, 122, 55, 14
 END
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 53eec42c5e4..943abd757ac 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -1,10 +1,9 @@
 /*
- * PROJECT: ReactOS system setup
- * FILE:    dll/win32/syssetup/lang/ro-RO.rc
- * PURPOSE: Romanian Language File for system setup
- * TRANSLATORS:
- *          Petru Dimitriu (petrimetri at gmail dot com)
- *          Ștefan Fulea (stefan dot fulea at mail dot com)
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Romanian resource file
+ * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com>
+ *              Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com>
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -83,11 +82,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Localizarea regională trebuie să se potrivească cu limba aplicațiilor
utilizate. De ea depinde cum vor apărea numerele, valutele și data.", IDC_STATIC, 53,
7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "Modificați configurația de localizare a sistemului.", IDC_STATIC,
53, 60, 186, 8
     PUSHBUTTON "&Configurare…", IDC_CUSTOMLOCALE, 230, 57, 70, 14
     LTEXT "Configurări și localizări pentru tastatură, aranjamente ale caracterelor
asociate tastelor la dactilografiere, și alte servicii de text.", IDC_STATIC, 53, 82,
253, 20
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Configurați aranjamentele de tastatură.", IDC_STATIC, 53, 126, 184,
8
     PUSHBUTTON "Config&urare…", IDC_CUSTOMLAYOUT, 230, 122, 70, 14
 END
diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index cf74da8f248..ad59183ad3a 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -1,5 +1,10 @@
-/* Russian translation by Dmitry Chapyshev, 2007-06-13
-   Updated by Oleg Dubinskiy, 2020-02-14               */
+/*
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Russian resource file
+ * TRANSLATORS: Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org>
+ *              Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua>
+ */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
@@ -77,11 +82,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Язык системы устанавливается и действует во всех приложениях. Можно
выбрать систему исчисления, формат чисел и даты.", IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "Для изменения языка системы нажмите
""Настроить"".", IDC_STATIC, 53, 60, 197, 8
     PUSHBUTTON "&Настроить...", IDC_CUSTOMLOCALE, 245, 57, 55, 14
     LTEXT "Выбрав раскладку вы сможете вводить символы на вашем языке.",
IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Для изменения раскладки нажмите ""Настроить"".",
IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "Н&астроить...", IDC_CUSTOMLAYOUT, 245, 122, 55, 14
 END
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index d301830e352..bb77c95158e 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -1,7 +1,8 @@
-/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk)
- * DATE OF TR.: 09-02-2008
- * LAST CHANGE: 15-12-2009
- * THANKS TO  : Filip Navara and Kamil Hornicek and all good people ;-)
+/*
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Slovak resource file
+ * TRANSLATORS: Copyright 2008-2009 Mário Kačmár aka Kario <kario(a)szm.sk>
  */
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
@@ -80,11 +81,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Lokalizácia systému by mala súhlasiť s jazykom aplikácií, ktoré chcete
používať. Lokalizácia určí ako budú zobrazené čísla, meny a údaje kalendára.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "<text lokality>", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "Pre zmenu lokalizácie systému kliknite na Zmeniť.", IDC_STATIC, 53,
60, 184, 8
     PUSHBUTTON "&Zmeniť...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "Rozloženie kláves určí znaky, ktoré sa zobrazia, keď píšete.",
IDC_STATIC, 53, 86, 253, 8
-    LTEXT "<text rozloženia>", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Pre zmenu rozloženia kláves, kliknite na Zmeniť.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "Z&meniť...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index 328684089b5..abb73c96c7c 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -92,12 +92,12 @@ CAPTION "Ndërto ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
-    LTEXT "Sistemi vendorë duhet të përputhet me gjuhën e aplikacioneve që dëshironi
të përdorni. Përdoruesi vendorë kontrollon se si duket numrat, monedhat, dhe datat.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "Sistemi vendorë duhet të përputhet me gjuhën e aplikacioneve që dëshironi
të përdorni. Përdoruesi vendorë kontrollon se si duket numrat, monedhat, dhe datat.",
IDC_STATIC, 53, 7, 253, 25
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "Për të ndryshuar parametrat e sistemit ose përdoruesit vendorë, kliko
Ndrysho.", IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Ndrysho...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "Paraqitja Tastierës kontrollon karakteret që shfaqen kur ju
shkruani.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Për të ndryshuar paraqitje tastieres, kliko Ndrysho.", IDC_STATIC,
53, 126, 184, 8
     PUSHBUTTON "Ndrysho...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index 45f0ae6d611..2a45a68fb66 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -93,11 +93,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 2a81ce914b2..2789ed3d3d3 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -93,11 +93,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "The system locale should match the language of the applications you want
to use. The user locale controls how numbers, currencies, and dates appear.",
IDC_STATIC, 53, 7, 253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "To change system or user locale settings, click Customize.",
IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
     PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc
index acd4100515a..3cd9bd6b497 100644
--- a/dll/win32/syssetup/lang/tr-TR.rc
+++ b/dll/win32/syssetup/lang/tr-TR.rc
@@ -1,4 +1,11 @@
-/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016,
2020 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+/*
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Turkish resource file
+ * TRANSLATORS: Copyright 2012 Arda Tanrıkulu &lt;ardatanrikulu(a)gmail.com&gt;
+ *              Copyright 2016, 2020 Erdem Ersoy &lt;erdemersoy(a)erdemersoy.net&gt;
+ *              Copyright 2021 Süleyman Poyraz &lt;zaryob.dev(a)gmail.com&gt;
+ */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -76,11 +83,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Sistem yerel ayarı, kullanmak istediğiniz uygulamaların diliyle
eşleşmelidir. Kullanıcı yerel ayarı; sayıların, para birimlerinin ve zamanların nasıl
görüneceğini denetler.", IDC_STATIC, 53, 7, 253, 60
-    LTEXT "", IDC_LOCALETEXT, 54, 34, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 34, 250, 16
     LTEXT "Sistem veya kullanıcı yerel ayarlarını değiştirmek için Özelleştir'e
tıklayınız.", IDC_STATIC, 53, 60, 196, 30
     PUSHBUTTON "Ö&zelleştir...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "Klavye düzeni, yazdığınızda gözüken karakterleri denetler.",
IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "Klavye düzenini değiştirmek için Özelleştir'e tıklayınız.",
IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "Öz&elleştir...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc
index 68b1529e100..f3aa55d56a7 100644
--- a/dll/win32/syssetup/lang/uk-UA.rc
+++ b/dll/win32/syssetup/lang/uk-UA.rc
@@ -1,9 +1,10 @@
 /*
- * PROJECT:     System setup
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll/win32/syssetup/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for syssetup
- * TRANSLATORS: Artem Reznikov, Igor Paliychuk, Yaroslav Kibysh
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Ukraianian resource file
+ * TRANSLATORS: Copyright 2007 Artem Reznikov &lt;temarez(a)yandex.ru&gt;
+ *              Copyright 2010-2011 Igor Paliychuk &lt;mansonigor(a)gmail.com&gt;
+ *              Copyright 2018-2021 Yaroslav Kibysh &lt;yanet.prod(a)gmail.com&gt;
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
@@ -82,11 +83,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Мова системи має відповідати мові додатків, які ви хочете
використовувати. Мова користувача задає формат виведення чисел, грошових одиниць і
дат.", IDC_STATIC, 53, 5, 253, 27
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 36, 250, 16
     LTEXT "Для зміни мови системи або мови користувача натисніть
""Налаштувати"".", IDC_STATIC, 53, 60, 184, 16
     PUSHBUTTON "На&лаштувати...", IDC_CUSTOMLOCALE, 240, 57, 57, 14
     LTEXT "Розкладка клавіатури визначає символи, що вводяться при натисненні
клавіш.", IDC_STATIC, 53, 84, 253, 18
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 250, 16
     LTEXT "Для зміни розкладки клавіатури натисніть
""Налаштувати"".", IDC_STATIC, 53, 126, 184, 18
     PUSHBUTTON "Нал&аштувати...", IDC_CUSTOMLAYOUT, 240, 122, 57, 14
 END
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index e2212912f8f..927891086a8 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -1,4 +1,9 @@
-/* Improved by Luo Yufan 2018-10-06 (njlyf2011(a)hotmail.com) */
+/*
+ * PROJECT:     ReactOS System Setup Library
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Chinese (Simplified) resource file
+ * TRANSLATORS: Copyright 2018 Luo Yufan &lt;njlyf2011(a)hotmail.com&gt;
+ */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
@@ -76,11 +81,11 @@ FONT 9, "宋体"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "系统区域设置应与您要使用的应用程序的语言相匹配。用户区域设置控制数字，货币和日期的显示方式。", IDC_STATIC, 53, 7,
253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "想要更改系统和用户的区域设置，请单击 “自定义” 。", IDC_STATIC, 53, 60, 184, 8
     PUSHBUTTON "自定义(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
     LTEXT "“文字输入语言”让您使用多种输入方法和设备用\n许多不同的语言输入文字。", IDC_STATIC, 53, 86, 253, 20
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 250, 16
     LTEXT "想要查看或改变当前配置，请单击“自定义”。", IDC_STATIC, 53, 124, 184, 8
     PUSHBUTTON "自定义(&U)...", IDC_CUSTOMLAYOUT, 245, 120, 50, 14
 END
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index dd67b20d1aa..116c0bed379 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -1,22 +1,3 @@
-/*
- * Copyright (C) 2004 Filip Navara
- * Copyright (C) 2004 Eric Kohl
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
 /*
  * PROJECT:     ReactOS System Setup Library
  * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
@@ -102,11 +83,11 @@ FONT 9, "新細明體"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
     LTEXT "系統區域設定應符合您要使用的應用程式的語言。使用者區域設定可控制數字，貨幣和日期的顯示方式。", IDC_STATIC, 53, 7,
253, 20
-    LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16
+    LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
     LTEXT "若要變更系統和使用者的地區設定, 請按［自訂］。", IDC_STATIC, 53, 60, 196, 8
     PUSHBUTTON "自訂(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14
     LTEXT "鍵盤配置控制鍵入時出現的字元。", IDC_STATIC, 53, 86, 253, 8
-    LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16
+    LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
     LTEXT "要查看或變更目前設定，請按［自訂］。", IDC_STATIC, 53, 126, 184, 8
     PUSHBUTTON "自訂(&U)...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14
 END
diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c
index 82c55e20fdc..c891813f1ae 100644
--- a/dll/win32/syssetup/wizard.c
+++ b/dll/win32/syssetup/wizard.c
@@ -1086,6 +1086,13 @@ ComputerPageDlgProc(HWND hwndDlg,
 }
 
 
+static VOID
+SetUserLocaleName(HWND hwnd)
+{
+    /* FIXME: Set actual locale name */
+    SetWindowTextW(hwnd, L"");
+}
+
 static VOID
 SetKeyboardLayoutName(HWND hwnd)
 {
@@ -1139,6 +1146,9 @@ SetKeyboardLayoutName(HWND hwnd)
     }
 
     RegCloseKey(hKey);
+#else
+    /* FIXME: Set actual layout name */
+    SetWindowTextW(hwnd, L"");
 #endif
 }
 
@@ -1233,6 +1243,7 @@ LocalePageDlgProc(HWND hwndDlg,
             SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData);
             WriteUserLocale();
 
+            SetUserLocaleName(GetDlgItem(hwndDlg, IDC_LOCALETEXT));
             SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT));
         }
         break;