23 Oct
2021
23 Oct
'21
9:16 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d09885ce4f92361194cf…
commit 6d09885ce4f92361194cfc5d27fde8bcaa23656c
Author: Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Thu Oct 21 04:38:07 2021 +0300
Commit: Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Sun Oct 24 00:12:18 2021 +0300
[SYSSETUP] Fill in missing locale, location, and default keyboard layout
- Implement functions to get regional data from system
- Disable setup window and buttons when control panel applet is started
- Update regional information when control panel applet is closed
- Add a horizontal separator between user locale and keyboard layout
---
dll/win32/syssetup/lang/bg-BG.rc | 3 +
dll/win32/syssetup/lang/cs-CZ.rc | 3 +
dll/win32/syssetup/lang/da-DK.rc | 3 +
dll/win32/syssetup/lang/de-DE.rc | 3 +
dll/win32/syssetup/lang/el-GR.rc | 3 +
dll/win32/syssetup/lang/en-GB.rc | 3 +
dll/win32/syssetup/lang/en-US.rc | 3 +
dll/win32/syssetup/lang/es-ES.rc | 3 +
dll/win32/syssetup/lang/et-EE.rc | 3 +
dll/win32/syssetup/lang/fi-FI.rc | 3 +
dll/win32/syssetup/lang/fr-FR.rc | 3 +
dll/win32/syssetup/lang/he-IL.rc | 3 +
dll/win32/syssetup/lang/hi-IN.rc | 3 +
dll/win32/syssetup/lang/hu-HU.rc | 3 +
dll/win32/syssetup/lang/id-ID.rc | 3 +
dll/win32/syssetup/lang/it-IT.rc | 3 +
dll/win32/syssetup/lang/ja-JP.rc | 3 +
dll/win32/syssetup/lang/lt-LT.rc | 3 +
dll/win32/syssetup/lang/nl-NL.rc | 3 +
dll/win32/syssetup/lang/no-NO.rc | 3 +
dll/win32/syssetup/lang/pl-PL.rc | 3 +
dll/win32/syssetup/lang/pt-BR.rc | 3 +
dll/win32/syssetup/lang/pt-PT.rc | 3 +
dll/win32/syssetup/lang/ro-RO.rc | 3 +
dll/win32/syssetup/lang/ru-RU.rc | 3 +
dll/win32/syssetup/lang/sk-SK.rc | 3 +
dll/win32/syssetup/lang/sq-AL.rc | 3 +
dll/win32/syssetup/lang/sv-SE.rc | 3 +
dll/win32/syssetup/lang/th-TH.rc | 3 +
dll/win32/syssetup/lang/tr-TR.rc | 3 +
dll/win32/syssetup/lang/uk-UA.rc | 3 +
dll/win32/syssetup/lang/zh-CN.rc | 3 +
dll/win32/syssetup/lang/zh-TW.rc | 3 +
dll/win32/syssetup/resource.h | 2 +
dll/win32/syssetup/wizard.c | 139 ++++++++++++++++++++++++++-------------
35 files changed, 193 insertions(+), 47 deletions(-)
diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 01cd32bf4a7..f02d2292ab5 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -77,6 +77,7 @@ BEGIN
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, 82, 246, 1, SS_ETCHEDHORZ
LTEXT "Клавиатурната подредба определя знаците, появяващи се при писане.",
IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "За смяна на клавиатурната подредба, натиснете „Нагласяване“.",
IDC_STATIC, 53, 126, 184, 16
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Трябва да въведете администраторска парола и име на
компютъра"
IDS_LOCALETITLE "Местни настройки"
IDS_LOCALESUBTITLE "Можете да нагласите РеактОС за различни области и
езици."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Дата и време"
IDS_DATETIMESUBTITLE "Задайте правилните дата и време."
IDS_PROCESSTITLE "Вписване на съставните"
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 05ab8b4f1bd..151e83400c9 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -85,6 +85,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ
LTEXT "Rozložení kláves určí znaky, které se zobrazí, když píšete.",
IDC_STATIC, 53, 86, 253, 8
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
@@ -182,6 +183,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Zadejte jméno a heslo pro účet Administrator."
IDS_LOCALETITLE "Regionální nastavení"
IDS_LOCALESUBTITLE "Systém ReactOS můžete přizpůsobit různým regionům a
jazykům."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Datum a čas"
IDS_DATETIMESUBTITLE "Nastavte správný čas pro Váš počítač."
IDS_PROCESSTITLE "Registrace součástí"
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index 49823fd973e..2eae84398b0 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index 0626f5a6278..5552e82e9e5 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ
LTEXT "Das Tastaturlayout gibt vor, welches Zeichen ein Tastendruck
bewirkt.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Klicken Sie auf Einstellen, um das Tastaturlayout zu ändern.",
IDC_STATIC, 53, 122, 188, 16
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für
Ihren Computer festlegen."
IDS_LOCALETITLE "Regionale Einstellungen"
IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und
Sprachen einstellen."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Datum und Uhrzeit"
IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit für Ihren
Computer ein."
IDS_PROCESSTITLE "Komponenten werden registriert"
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index 9d27c1da0bd..163d0fc8958 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -77,6 +77,7 @@ BEGIN
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, 79, 241, 1, SS_ETCHEDHORZ
LTEXT "Η διάταξη πληκτρολογίου έλέγχει τους χαρακτήρες που θα εμφανίζονται καθώς
πληκτρολογείτε.", IDC_STATIC, 53, 86, 253, 20
LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 253, 16
LTEXT "Για να αλλάξετε τη διάταξη του πληκτρολογίου, πατήστε το κουμπί
'Προσαρμογή'.", IDC_STATIC, 53, 122, 184, 16
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Πρέπει να δώσετε ένα όνομα και έναν κωδικό πρόσβασης για
τον υπολογιστή σας."
IDS_LOCALETITLE "Τοπικές ρυθμίσεις"
IDS_LOCALESUBTITLE "Μπορείτε να προσαρμόσετε το ReactOS για διαφορετικές
περιοχές και γλώσσες."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Ημερομηνία και ώρα"
IDS_DATETIMESUBTITLE "Ορίστε τη σωστή ημερομηνία και ώρα για τον υπολογιστή
σας."
IDS_PROCESSTITLE "Τίτλος"
diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc
index c8126ad911c..52dc9989491 100644
--- a/dll/win32/syssetup/lang/en-GB.rc
+++ b/dll/win32/syssetup/lang/en-GB.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customise.", IDC_STATIC, 53,
126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customise ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index bd93b61cefb..c99ee4208a6 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index ee6366d8656..aec821b46c5 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -86,6 +86,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ
LTEXT "La distribución del teclado determina el caracter que se muestra al
presionar cada tecla.", IDC_STATIC, 53, 86, 253, 32
LTEXT "%s", IDC_LAYOUTTEXT, 53, 109, 250, 16
LTEXT "Para cambiar la distribución del teclado, pulse Modificar.",
IDC_STATIC, 53, 126, 184, 8
@@ -183,6 +184,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Debe dar un nombre y una contraseña de Administrador a su
equipo."
IDS_LOCALETITLE "Opciones regionales"
IDS_LOCALESUBTITLE "Puede personalizar ReactOS para diferentes regiones e
idiomas."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Fecha y hora"
IDS_DATETIMESUBTITLE "Fije la fecha y hora correcta de su equipo."
IDS_PROCESSTITLE "Registrando componentes"
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index 9c644328ec7..f4dbf052aa5 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "Klaviatuuriasetus määrab tähemärgid, mis klaviatuuril kirjutades
ilmuvad.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Klaviatuuriasetuse muutmiseks vajuta Täp&susta.", IDC_STATIC,
53, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Arvutile tuleb anda nimi ja administraatori parool."
IDS_LOCALETITLE "Regionaalsed seaded"
IDS_LOCALESUBTITLE "ReactOS'i saab kohandada erinevatele regioonidele ja
keeltele vastavaks."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Kuupäev ja kellaaeg"
IDS_DATETIMESUBTITLE "Sisesta õige kellaaeg ja kuupäev."
IDS_PROCESSTITLE "Komponentide registreerimine"
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index 7ae61fcc45f..cdf3c2ab56c 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc
index c57acfb5b7c..425c358a939 100644
--- a/dll/win32/syssetup/lang/fr-FR.rc
+++ b/dll/win32/syssetup/lang/fr-FR.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "La configuration clavier contrôle la saisie des touches quand vous
tapez.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Pour changer la configuration clavier, cliquez sur Modifier.",
IDC_STATIC, 53, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Vous devez fournir un nom et un mot de passe
Administrateur pour votre ordinateur."
IDS_LOCALETITLE "Options régionales"
IDS_LOCALESUBTITLE "Vous pouvez modifier ReactOS pour différentes régions et
langues."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date et Heure"
IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre
ordinateur."
IDS_PROCESSTITLE "Enregistrement des composants"
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index 58c659779ee..80ba2d65384 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "הגדרות אזור"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "תאריך ושעה"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "רושם מרכיבים"
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index 4a022b49593..1625a5de437 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -84,6 +84,7 @@ BEGIN
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, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "कीबोर्ड लेआउट आपके द्वारा टाइप किए जाने पर दिखाई देने वाले अक्षरों को
नियंत्रित करता है।", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "कीबोर्ड लेआउट बदलने के लिए, अनुकूलित करें पर क्लिक करें।",
IDC_STATIC, 53, 126, 184, 8
@@ -181,6 +182,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "आपको अपने कंप्यूटर के लिए एक नाम और एक एडमिनिस्ट्रेटर
पासवर्ड प्रदान करना होगा।"
IDS_LOCALETITLE "क्षेत्रीय सेटिंग"
IDS_LOCALESUBTITLE "आप विभिन्न क्षेत्रों और भाषाओं के लिए रिऐक्ट ओएस को अनुकूलित
कर सकते हैं।"
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "दिनांक और समय"
IDS_DATETIMESUBTITLE "अपने कंप्यूटर के लिए सही तारीख और समय निर्धारित
करें।"
IDS_PROCESSTITLE "कम्पोनन्ट का दर्ज"
diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc
index 250f054421b..726fa58848d 100644
--- a/dll/win32/syssetup/lang/hu-HU.rc
+++ b/dll/win32/syssetup/lang/hu-HU.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 250, 1, SS_ETCHEDHORZ
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
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Meg kell adnia egy számítógép nevet és a rendszergazda
jelszavát."
IDS_LOCALETITLE "Területi beállítások"
IDS_LOCALESUBTITLE "Beállíthatja, hogy a ReactOS milyen területi és nyelvi
beállításokkal működjön."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Dátum és idő"
IDS_DATETIMESUBTITLE "Beállíthatja a számítógép dátumát és óráját."
IDS_PROCESSTITLE "Összetevők regisztrálása"
diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc
index 918339d2209..282b7f13165 100644
--- a/dll/win32/syssetup/lang/id-ID.rc
+++ b/dll/win32/syssetup/lang/id-ID.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 81, 241, 1, SS_ETCHEDHORZ
LTEXT "Tata letak papan ketik mengontrol tampilan karakter yang muncul ketika
anda ketik.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Untuk mengubah tata letak papan ketik, klik Sesuaikan.", IDC_STATIC,
53, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Anda harus menyediakan nama dan Kata sandi Administrator
untuk komputer anda."
IDS_LOCALETITLE "Setelan Daerah"
IDS_LOCALESUBTITLE "Anda bisa menyesuaikan ReactOS untuk daerah dan bahasa
berbeda."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Tanggal dan Jam"
IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer
anda."
IDS_PROCESSTITLE "Judul halaman proses"
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index e331653350c..9a25d6f517a 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 20, 76, 278, 1, SS_ETCHEDHORZ
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
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "È necessario fornire un nome e una password di
Administrator per il proprio computer."
IDS_LOCALETITLE "Impostazioni regionali"
IDS_LOCALESUBTITLE "È possibile personalizzare ReactOS per regioni e lingue
differenti."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Data e ora"
IDS_DATETIMESUBTITLE "Impostare la data e l'ora corrette per il proprio
computer."
IDS_PROCESSTITLE "Registrazione dei componenti"
diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index f3299fd34bb..82b32a85143 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -77,6 +77,7 @@ BEGIN
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, 74, 246, 1, SS_ETCHEDHORZ
LTEXT "キーボード レイアウトは、キーを押したときにどの文字が入力されるかを制御します。", IDC_STATIC, 53, 81, 253,
20
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "キーボード レイアウト変更には [カスタマイズ] をクリックします。", IDC_STATIC, 53, 120, 166, 25
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "コンピュータ名と Administrator パスワードを入力する必要があります。"
IDS_LOCALETITLE "地域の設定"
IDS_LOCALESUBTITLE "ReactOS を様々な地域と言語にあわせてカスタマイズすることができます。"
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "日付と時刻"
IDS_DATETIMESUBTITLE "コンピュータの日付と時刻を正しく設定して下さい。"
IDS_PROCESSTITLE "コンポーネントの登録中"
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index d224001fdda..576131703c2 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index 7bfd5a0c99d..7d594f52b43 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index 8a4339656f1..b8e4e2f1f09 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "Tastatur oppsettet kontrollerer karakterene som kommer opp når du
trykker.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "For å forandre tastatur oppsettet, trykk på Tilpass.", IDC_STATIC,
53, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Du må angi et navn og et administrator passord for din
datamaskin."
IDS_LOCALETITLE "Regionale innstillinger"
IDS_LOCALESUBTITLE "Du kan stille inn ReactOS for andre regioner og
språk."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Dato og tid"
IDS_DATETIMESUBTITLE "Still inn dato og tid for din datamaskin."
IDS_PROCESSTITLE "Bearbeid side tittel"
diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc
index 1636f569927..828acf3e386 100644
--- a/dll/win32/syssetup/lang/pl-PL.rc
+++ b/dll/win32/syssetup/lang/pl-PL.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ
LTEXT "Układ klawiatury decyduje o przyporządkowaniu znaków pod klawisze.",
IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Aby zmienić układ klawiatury, kliknij przycisk Dostosuj.",
IDC_STATIC, 53, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Należy podać nazwę dla tego komputera oraz hasło
administratora."
IDS_LOCALETITLE "Opcje regionalne i językowe"
IDS_LOCALESUBTITLE "System ReactOS można dostosować pod kątem języka i sposobu
wyświetlania danych."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Data i godzina"
IDS_DATETIMESUBTITLE "Ustaw prawidłową datę i godzinę."
IDS_PROCESSTITLE "Rejestracja składników"
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index a71549d3057..a2c5c176717 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "O layout do teclado controla os caracteres que aparecem quando você
digita.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Para alterar o layout do teclado, clique Personalizar.", IDC_STATIC,
53, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Você deve fornecer um nome e senha de administrador para o
seu computador."
IDS_LOCALETITLE "Configurações Regionais"
IDS_LOCALESUBTITLE "Você pode personalizar o ReactOS para diferentes regiões e
línguas."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Data e Hora"
IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu
computador."
IDS_PROCESSTITLE "Registrando componentes"
diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc
index 9dc33e265ee..db1ca0fd77f 100644
--- a/dll/win32/syssetup/lang/pt-PT.rc
+++ b/dll/win32/syssetup/lang/pt-PT.rc
@@ -77,6 +77,7 @@ BEGIN
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 "", IDC_STATIC, 50, 79, 249, 1, SS_ETCHEDHORZ
LTEXT "O tipo de teclado controla os caracteres que aparecem quando
digita.", IDC_STATIC, 50, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 50, 100, 250, 16
LTEXT "Para alterar o tipo do teclado, clique em Personalizar.",
IDC_STATIC, 50, 126, 184, 8
@@ -174,6 +175,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Deve fornecer um nome e palavra-passe de administrador
para o seu computador."
IDS_LOCALETITLE "Configurações Regionais"
IDS_LOCALESUBTITLE "Pode personalizar o ReactOS para diferentes regiões e
línguas."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Data e Hora"
IDS_DATETIMESUBTITLE "Definir a data e a hora correctas para o seu
computador."
IDS_PROCESSTITLE "A registar componentes"
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 943abd757ac..a41910ee409 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -85,6 +85,7 @@ BEGIN
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 "", IDC_STATIC, 53, 78, 246, 1, SS_ETCHEDHORZ
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 "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Configurați aranjamentele de tastatură.", IDC_STATIC, 53, 126, 184,
8
@@ -182,6 +183,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Furnizare nume pentru calculator și parolă pentru contul
Administrator"
IDS_LOCALETITLE "Particularizări regionale"
IDS_LOCALESUBTITLE "Particularizare sistem pentru anumite regiuni sau
limbi"
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Dată și oră"
IDS_DATETIMESUBTITLE "Stabilire dată și oră corectă pentru calculator"
IDS_PROCESSTITLE "Înregistrare componente"
diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index ad59183ad3a..c88d2a1b21f 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -85,6 +85,7 @@ BEGIN
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, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "Выбрав раскладку вы сможете вводить символы на вашем языке.",
IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Для изменения раскладки нажмите ""Настроить"".",
IDC_STATIC, 53, 126, 184, 8
@@ -182,6 +183,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Вы должны ввести имя и администраторский пароль для вашего
компьютера."
IDS_LOCALETITLE "Региональные настройки"
IDS_LOCALESUBTITLE "Вы можете настраивать ReactOS для разных регионов и
языков."
+ IDS_LOCALETEXT "Языковые стандарты и форматы: %s, расположение: %s."
+ IDS_LAYOUTTEXT "Ваш язык и метод ввода текста по умолчанию: %s раскладка
клавиатуры"
IDS_DATETIMETITLE "Дата и время"
IDS_DATETIMESUBTITLE "Установите правильную дату и время на вашем
компьютере."
IDS_PROCESSTITLE "Процесс установки"
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index bb77c95158e..75dbe067973 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -84,6 +84,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 241, 1, SS_ETCHEDHORZ
LTEXT "Rozloženie kláves určí znaky, ktoré sa zobrazia, keď píšete.",
IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Pre zmenu rozloženia kláves, kliknite na Zmeniť.", IDC_STATIC, 53,
126, 184, 8
@@ -181,6 +182,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Zadajte meno a heslo pre účet Administrator."
IDS_LOCALETITLE "Regionálne nastavenia"
IDS_LOCALESUBTITLE "Systém ReactOS môžete prispôsobiť rôznym regiónom a
jazykom."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Dátum a čas"
IDS_DATETIMESUBTITLE "Nastavte správny čas pre Váš počítač."
IDS_PROCESSTITLE "Registrácia súčastí"
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index abb73c96c7c..b2f52560bdf 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "Paraqitja Tastierës kontrollon karakteret që shfaqen kur ju
shkruani.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "Për të ndryshuar paraqitje tastieres, kliko Ndrysho.", IDC_STATIC,
53, 126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Ju duhet të siguroni një emër dhe një Fjalëkalim
Administratori për kompjuterin tuaj."
IDS_LOCALETITLE "Cilësimet Rajonale"
IDS_LOCALESUBTITLE "Ju mund ta rregulloje ReactOS për rajone dhe gjuhë të
ndryshme."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Data dhe Ora"
IDS_DATETIMESUBTITLE "Vendos datën e saktë dhe orën për kompjuterin tuaj."
IDS_PROCESSTITLE "Regjistrimi Komponenteve"
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index 2a45a68fb66..8ca9de01d65 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 2789ed3d3d3..49f004e3f98 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -96,6 +96,7 @@ BEGIN
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 "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "The keyboard layout controls the characters that appear when you
type.", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53,
126, 184, 8
@@ -193,6 +194,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for
your computer."
IDS_LOCALETITLE "Regional settings"
IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and
languages."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Date and Time"
IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
IDS_PROCESSTITLE "Registering Components"
diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc
index 3cd9bd6b497..ce03d962c38 100644
--- a/dll/win32/syssetup/lang/tr-TR.rc
+++ b/dll/win32/syssetup/lang/tr-TR.rc
@@ -86,6 +86,7 @@ BEGIN
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 "", IDC_STATIC, 53, 81, 246, 1, SS_ETCHEDHORZ
LTEXT "Klavye düzeni, yazdığınızda gözüken karakterleri denetler.",
IDC_STATIC, 53, 86, 253, 8
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
@@ -183,6 +184,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Bilgisayarınız için bir ad ve bir Yönetici Şifresi
sağlamalısınız."
IDS_LOCALETITLE "Yerel Ayarlar"
IDS_LOCALESUBTITLE "Farklı bölgeler ve diller için ReactOS'u
özelleştirebilirsiniz."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Tarih ve Saat"
IDS_DATETIMESUBTITLE "Bilgisayarınız için doğru zamanı ayarlayınız."
IDS_PROCESSTITLE "Bileşenler Kaydediliyor"
diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc
index f3aa55d56a7..1f7009ad7cb 100644
--- a/dll/win32/syssetup/lang/uk-UA.rc
+++ b/dll/win32/syssetup/lang/uk-UA.rc
@@ -86,6 +86,7 @@ BEGIN
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, 81, 246, 1, SS_ETCHEDHORZ
LTEXT "Розкладка клавіатури визначає символи, що вводяться при натисненні
клавіш.", IDC_STATIC, 53, 84, 253, 18
LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 250, 16
LTEXT "Для зміни розкладки клавіатури натисніть
""Налаштувати"".", IDC_STATIC, 53, 126, 184, 18
@@ -183,6 +184,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "Ви маєте вказати ім'я та пароль адміністратора Вашого
комп'ютера."
IDS_LOCALETITLE "Регіональні налаштування"
IDS_LOCALESUBTITLE "Ви можете налаштувати ReactOS для різних регіонів і
мов."
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "Дата та час"
IDS_DATETIMESUBTITLE "Встановіть правильні дату і час для Вашого
комп'ютера."
IDS_PROCESSTITLE "Реєстрація компонентів"
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index 927891086a8..b98b7d4c39c 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -84,6 +84,7 @@ BEGIN
LTEXT "%s", IDC_LOCALETEXT, 53, 29, 250, 16
LTEXT "想要更改系统和用户的区域设置，请单击 “自定义” 。", IDC_STATIC, 53, 60, 184, 8
PUSHBUTTON "自定义(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14
+ LTEXT "", IDC_STATIC, 53, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "“文字输入语言”让您使用多种输入方法和设备用\n许多不同的语言输入文字。", IDC_STATIC, 53, 86, 253, 20
LTEXT "%s", IDC_LAYOUTTEXT, 53, 106, 250, 16
LTEXT "想要查看或改变当前配置，请单击“自定义”。", IDC_STATIC, 53, 124, 184, 8
@@ -181,6 +182,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "您必须提供计算机名和系统管理员密码。"
IDS_LOCALETITLE "区域设置"
IDS_LOCALESUBTITLE "您可以为不同的区域和语言自定义 ReactOS。"
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "日期和时间"
IDS_DATETIMESUBTITLE "为您的计算机配置正确的日期和时间。"
IDS_PROCESSTITLE "注册组件"
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index 116c0bed379..707a831294c 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -86,6 +86,7 @@ BEGIN
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, 79, 246, 1, SS_ETCHEDHORZ
LTEXT "鍵盤配置控制鍵入時出現的字元。", IDC_STATIC, 53, 86, 253, 8
LTEXT "%s", IDC_LAYOUTTEXT, 53, 100, 250, 16
LTEXT "要查看或變更目前設定，請按［自訂］。", IDC_STATIC, 53, 126, 184, 8
@@ -183,6 +184,8 @@ BEGIN
IDS_COMPUTERSUBTITLE "您必須提供電腦名稱和管理員密碼。"
IDS_LOCALETITLE "地區設定"
IDS_LOCALESUBTITLE "您可以為不同的地區和語言自訂 ReactOS。"
+ IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set
to %s."
+ IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard
layout"
IDS_DATETIMETITLE "日期和時間"
IDS_DATETIMESUBTITLE "為您的電腦配置正確的日期和時間。"
IDS_PROCESSTITLE "正在登錄元件"
diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h
index f4f24462dff..173f3f05ad5 100644
--- a/dll/win32/syssetup/resource.h
+++ b/dll/win32/syssetup/resource.h
@@ -108,6 +108,8 @@
#define IDS_LOCALETITLE 3040
#define IDS_LOCALESUBTITLE 3041
+#define IDS_LOCALETEXT 3042
+#define IDS_LAYOUTTEXT 3043
#define IDS_DATETIMETITLE 3050
#define IDS_DATETIMESUBTITLE 3051
diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c
index c891813f1ae..330b0f2916b 100644
--- a/dll/win32/syssetup/wizard.c
+++ b/dll/win32/syssetup/wizard.c
@@ -1089,67 +1089,99 @@ ComputerPageDlgProc(HWND hwndDlg,
static VOID
SetUserLocaleName(HWND hwnd)
{
- /* FIXME: Set actual locale name */
- SetWindowTextW(hwnd, L"");
+ WCHAR CurLocale[256] = L"";
+ WCHAR CurGeo[256] = L"";
+ WCHAR ResText[256] = L"";
+ WCHAR LocaleText[256 * 2];
+
+ GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, CurLocale,
ARRAYSIZE(CurLocale));
+ GetGeoInfoW(GetUserGeoID(GEOCLASS_NATION), GEO_FRIENDLYNAME, CurGeo,
ARRAYSIZE(CurGeo), LANG_SYSTEM_DEFAULT);
+
+ LoadStringW(hDllInstance, IDS_LOCALETEXT, ResText, ARRAYSIZE(ResText));
+ StringCchPrintfW(LocaleText, ARRAYSIZE(LocaleText), ResText, CurLocale, CurGeo);
+
+ SetWindowTextW(hwnd, LocaleText);
}
static VOID
SetKeyboardLayoutName(HWND hwnd)
{
-#if 0
- TCHAR szLayoutPath[256];
- TCHAR szLocaleName[32];
- DWORD dwLocaleSize;
+ HKL hkl;
+ BOOL LayoutSpecial = FALSE;
+ WCHAR LayoutPath[256];
+ WCHAR LocaleName[32];
+ WCHAR SpecialId[5] = L"";
+ WCHAR ResText[256] = L"";
+ DWORD dwValueSize;
HKEY hKey;
+ UINT i;
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Locale"),
- 0,
- KEY_ALL_ACCESS,
- &hKey))
- return;
+ /* Get the default input language and method */
+ if (!SystemParametersInfoW(SPI_GETDEFAULTINPUTLANG, 0, (LPDWORD)&hkl, 0))
+ {
+ hkl = GetKeyboardLayout(0);
+ }
- dwValueSize = 16 * sizeof(TCHAR);
- if (RegQueryValueEx(hKey,
- NULL,
- NULL,
- NULL,
- szLocaleName,
- &dwLocaleSize))
+ if ((HIWORD(hkl) & 0xF000) == 0xF000)
{
- RegCloseKey(hKey);
- return;
+ /* Process keyboard layout with special id */
+ StringCchPrintfW(SpecialId, ARRAYSIZE(SpecialId), L"%04x", (HIWORD(hkl)
& 0x0FFF));
+ LayoutSpecial = TRUE;
}
- _tcscpy(szLayoutPath,
- _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"));
- _tcscat(szLayoutPath,
- szLocaleName);
+#define MAX_LAYOUTS_PER_LANGID 0x10000
+ for (i = 0; i < (LayoutSpecial ? MAX_LAYOUTS_PER_LANGID : 1); i++)
+ {
+ /* Generate a hexadecimal identifier for keyboard layout registry key */
+ StringCchPrintfW(LocaleName, ARRAYSIZE(LocaleName), L"%08lx", (i
<< 16) | LOWORD(hkl));
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- szLayoutPath,
- 0,
- KEY_ALL_ACCESS,
- &hKey))
- return;
+ StringCchCopyW(LayoutPath, ARRAYSIZE(LayoutPath),
L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\");
+ StringCchCatW(LayoutPath, ARRAYSIZE(LayoutPath), LocaleName);
+ *LocaleName = UNICODE_NULL;
- dwValueSize = 32 * sizeof(TCHAR);
- if (RegQueryValueEx(hKey,
- _T("Layout Text"),
- NULL,
- NULL,
- szLocaleName,
- &dwLocaleSize))
- {
- RegCloseKey(hKey);
- return;
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ LayoutPath,
+ 0,
+ KEY_ALL_ACCESS,
+ &hKey) == ERROR_SUCCESS)
+ {
+ /* Make sure the keyboard layout key we opened is the one we need.
+ * If the layout has no special id, just pass this check. */
+ dwValueSize = sizeof(LocaleName);
+ if (!LayoutSpecial ||
+ ((RegQueryValueExW(hKey,
+ L"Layout Id",
+ NULL,
+ NULL,
+ (PVOID)&LocaleName,
+ &dwValueSize) == ERROR_SUCCESS) &&
+ (wcscmp(LocaleName, SpecialId) == 0)))
+ {
+ *LocaleName = UNICODE_NULL;
+ dwValueSize = sizeof(LocaleName);
+ RegQueryValueExW(hKey,
+ L"Layout Text",
+ NULL,
+ NULL,
+ (PVOID)&LocaleName,
+ &dwValueSize);
+ /* Let the loop know where to stop */
+ i = MAX_LAYOUTS_PER_LANGID;
+ }
+ RegCloseKey(hKey);
+ }
+ else
+ {
+ /* Keyboard layout registry keys are expected to go in order without gaps */
+ break;
+ }
}
+#undef MAX_LAYOUTS_PER_LANGID
- RegCloseKey(hKey);
-#else
- /* FIXME: Set actual layout name */
- SetWindowTextW(hwnd, L"");
-#endif
+ LoadStringW(hDllInstance, IDS_LAYOUTTEXT, ResText, ARRAYSIZE(ResText));
+ StringCchPrintfW(LayoutPath, ARRAYSIZE(LayoutPath), ResText, LocaleName);
+
+ SetWindowTextW(hwnd, LayoutPath);
}
@@ -1157,6 +1189,7 @@ static BOOL
RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters)
{
MSG msg;
+ HWND MainWindow = GetParent(hwnd);
STARTUPINFOW StartupInfo;
PROCESS_INFORMATION ProcessInformation;
WCHAR CmdLine[MAX_PATH] = L"rundll32.exe shell32.dll,Control_RunDLL ";
@@ -1189,8 +1222,14 @@ RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters)
return FALSE;
}
+ /* Disable the Back and Next buttons and the main window
+ * while we're interacting with the control panel applet */
+ PropSheet_SetWizButtons(MainWindow, 0);
+ EnableWindow(MainWindow, FALSE);
+
while ((MsgWaitForMultipleObjects(1, &ProcessInformation.hProcess, FALSE,
INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0)
{
+ /* We still need to process main window messages to avoid freeze */
while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
{
TranslateMessage(&msg);
@@ -1199,6 +1238,11 @@ RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters)
}
CloseHandle(ProcessInformation.hThread);
CloseHandle(ProcessInformation.hProcess);
+
+ /* Enable the Back and Next buttons and the main window again */
+ PropSheet_SetWizButtons(MainWindow, PSWIZB_BACK | PSWIZB_NEXT);
+ EnableWindow(MainWindow, TRUE);
+
return TRUE;
}
@@ -1255,11 +1299,12 @@ LocalePageDlgProc(HWND hwndDlg,
{
case IDC_CUSTOMLOCALE:
RunControlPanelApplet(hwndDlg, L"intl.cpl,,5");
- /* FIXME: Update input locale name */
+ SetUserLocaleName(GetDlgItem(hwndDlg, IDC_LOCALETEXT));
break;
case IDC_CUSTOMLAYOUT:
RunControlPanelApplet(hwndDlg, L"input.dll,@1");
+ SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT));
break;
}
}