[INTL]

Implement the "Apply all settings to the current user account and to the default user profile" feature.
CORE-10172

svn path=/trunk/; revision=69280

diff --git a/reactos/dll/cpl/intl/advanced.c b/reactos/dll/cpl/intl/advanced.c
index 6752fd4..d474a69 100644 (file)
--- a/reactos/dll/cpl/intl/advanced.c
+++ b/reactos/dll/cpl/intl/advanced.c
@@ -346,28 +346,51 @@ AdvancedPageProc(HWND hwndDlg,
                  WPARAM wParam,
                  LPARAM lParam)
 {
                  WPARAM wParam,
                  LPARAM lParam)
 {

-    switch(uMsg)
+    PGLOBALDATA pGlobalData;
+
+    pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
+
+    switch (uMsg)

     {
         case WM_INITDIALOG:
     {
         case WM_INITDIALOG:

-        {
+            pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
+

             InitLanguagesList(hwndDlg);
             InitCodePagesList(hwndDlg);
             InitLanguagesList(hwndDlg);
             InitCodePagesList(hwndDlg);

-        }
-        break;
+            break;

 
         case WM_COMMAND:
 
         case WM_COMMAND:

-        {

             switch (LOWORD(wParam))
             {
                 case IDC_LANGUAGE_COMBO:
             switch (LOWORD(wParam))
             {
                 case IDC_LANGUAGE_COMBO:

-                {

                     if (HIWORD(wParam) == CBN_SELCHANGE)
                     if (HIWORD(wParam) == CBN_SELCHANGE)

+                    {

                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);

-                }
-                break;
+                    }
+                    break;
+
+                case IDC_APPLY_CUR_USER_DEF_PROFILE:
+                    if (HIWORD(wParam) == BN_CLICKED)
+                    {
+                        if (SendDlgItemMessageW(hwndDlg, IDC_APPLY_CUR_USER_DEF_PROFILE, BM_GETCHECK, 0, 0))
+                        {
+                            ResourceMessageBox(hwndDlg,
+                                               MB_OK | MB_ICONWARNING,
+                                               IDS_APPLY_DEFAULT_TITLE,
+                                               IDS_APPLY_DEFAULT_TEXT);
+                            pGlobalData->bApplyToDefaultUser = TRUE;
+                        }
+                        else
+                        {
+                            pGlobalData->bApplyToDefaultUser = FALSE;
+                        }
+
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                    }
+                    break;

             }
             }

-        }
-        break;
+            break;

 
         case WM_NOTIFY:
         {
 
         case WM_NOTIFY:
         {

diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c
index f36fb10..564a4b8 100644 (file)
--- a/reactos/dll/cpl/intl/generalp.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -298,6 +298,7 @@ FreeCurrentLocale(
             HeapFree(GetProcessHeap(), 0, pGlobalData->pLocaleArray[i]);
     }
     HeapFree(GetProcessHeap(), 0, pGlobalData->pLocaleArray);
             HeapFree(GetProcessHeap(), 0, pGlobalData->pLocaleArray[i]);
     }
     HeapFree(GetProcessHeap(), 0, pGlobalData->pLocaleArray);

+    pGlobalData->pLocaleArray = NULL;

 }
 
 
 }
 
 


@@ -342,17 +343,51 @@ VOID
 SaveCurrentLocale(
     PGLOBALDATA pGlobalData)
 {
 SaveCurrentLocale(
     PGLOBALDATA pGlobalData)
 {

-    // HKCU\\Control Panel\\International\\Locale = 0409 (type=0)
-    // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x00000000,"0409" (type=0)
-    // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x00000000,"0409" (type=0)
-
-    // Set locale

     HKEY localeKey;
     DWORD ret;
     WCHAR value[9];
     DWORD valuesize;
     DWORD i;
 
     HKEY localeKey;
     DWORD ret;
     WCHAR value[9];
     DWORD valuesize;
     DWORD i;
 

+    wsprintf(value, L"%08x", (DWORD)pGlobalData->lcid);
+    valuesize = (wcslen(value) + 1) * sizeof(WCHAR);
+
+    if (pGlobalData->bApplyToDefaultUser)
+    {
+        ret = RegOpenKeyExW(HKEY_USERS,
+                            L".DEFAULT\\Control Panel\\International",
+                            0,
+                            KEY_WRITE,
+                            &localeKey);
+        if (ret != ERROR_SUCCESS)
+        {
+            PrintErrorMsgBox(IDS_ERROR_DEF_INT_KEY_REG);
+            return;
+        }
+
+        ret = RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (PBYTE)value, valuesize);
+        if (ret != ERROR_SUCCESS)
+        {
+            RegCloseKey(localeKey);
+            PrintErrorMsgBox(IDS_ERROR_INT_KEY_REG);
+            return;
+        }
+
+        for (i = 0; i < pGlobalData->dwLocaleCount; i++)
+        {
+            RegSetValueExW(localeKey,
+                           LocaleKeyData[i].pKeyName,
+                           0,
+                           REG_SZ,
+                           (PBYTE)pGlobalData->pLocaleArray[i],
+                           (wcslen(pGlobalData->pLocaleArray[i]) + 1) * sizeof(WCHAR));
+        }
+
+        /* Flush and close the locale key */
+        RegFlushKey(localeKey);
+        RegCloseKey(localeKey);
+    }
+

     ret = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\International",
                         0, KEY_READ | KEY_WRITE, &localeKey);
     if (ret != ERROR_SUCCESS)
     ret = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\International",
                         0, KEY_READ | KEY_WRITE, &localeKey);
     if (ret != ERROR_SUCCESS)


@@ -361,9 +396,6 @@ SaveCurrentLocale(
         return;
     }
 
         return;
     }
 

-    wsprintf(value, L"%08x", (DWORD)pGlobalData->lcid);
-    valuesize = (wcslen(value) + 1) * sizeof(WCHAR);
-

     ret = RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (PBYTE)value, valuesize);
     if (ret != ERROR_SUCCESS)
     {
     ret = RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (PBYTE)value, valuesize);
     if (ret != ERROR_SUCCESS)
     {


@@ -488,7 +520,7 @@ GeneralPageProc(HWND hwndDlg,
     switch (uMsg)
     {
         case WM_INITDIALOG:
     switch (uMsg)
     {
         case WM_INITDIALOG:

-            pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBALDATA));
+            pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam;

             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
 
             if (pGlobalData)
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
 
             if (pGlobalData)


@@ -611,7 +643,6 @@ GeneralPageProc(HWND hwndDlg,
             if (pGlobalData)
             {
                 FreeCurrentLocale(pGlobalData);
             if (pGlobalData)
             {
                 FreeCurrentLocale(pGlobalData);

-                HeapFree(GetProcessHeap(), 0, pGlobalData);

             }
             break;
     }
             }
             break;
     }

diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index 2bb503e..057f52b 100644 (file)
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -60,8 +60,24 @@ PrintErrorMsgBox(UINT msg)
     MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR);
 }
 
     MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR);
 }
 

+VOID
+ResourceMessageBox(
+    HWND hwnd,
+    UINT uType,
+    UINT uCaptionId,
+    UINT uMessageId)
+{
+    WCHAR szErrorText[BUFFERSIZE];
+    WCHAR szErrorCaption[BUFFERSIZE];
+
+    LoadStringW(hApplet, uMessageId, szErrorText, sizeof(szErrorText) / sizeof(WCHAR));
+    LoadStringW(hApplet, uCaptionId, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR));
+
+    MessageBoxW(hwnd, szErrorText, szErrorCaption, uType);
+}
+

 static VOID
 static VOID

-InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPARAM lParam)

 {
     ZeroMemory(psp, sizeof(PROPSHEETPAGE));
     psp->dwSize = sizeof(PROPSHEETPAGE);
 {
     ZeroMemory(psp, sizeof(PROPSHEETPAGE));
     psp->dwSize = sizeof(PROPSHEETPAGE);


@@ -69,6 +85,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
     psp->hInstance = hApplet;
     psp->pszTemplate = MAKEINTRESOURCE(idDlg);
     psp->pfnDlgProc = DlgProc;
     psp->hInstance = hApplet;
     psp->pszTemplate = MAKEINTRESOURCE(idDlg);
     psp->pfnDlgProc = DlgProc;

+    psp->lParam = lParam;

 }
 
 BOOL
 }
 
 BOOL


@@ -135,15 +152,19 @@ ParseSetupInf(VOID)
 static LONG APIENTRY
 Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {
 static LONG APIENTRY
 Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
 {

+    TCHAR Caption[BUFFERSIZE];

     PROPSHEETPAGE psp[3];
     PROPSHEETHEADER psh;
     PROPSHEETPAGE psp[3];
     PROPSHEETHEADER psh;

-    TCHAR Caption[BUFFERSIZE];
+    PGLOBALDATA pGlobalData;
+    LONG ret;

 
     if (OpenSetupInf())
     {
         ParseSetupInf();
     }
 
 
     if (OpenSetupInf())
     {
         ParseSetupInf();
     }
 

+    pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBALDATA));
+

     LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));


@@ -157,11 +178,15 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     psh.nStartPage = 0;
     psh.ppsp = psp;
 
     psh.nStartPage = 0;
     psh.ppsp = psp;
 

-    InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc);
-    InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc);
-    InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc);
+    InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData);
+    InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData);
+    InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData);
+
+    ret = (LONG)(PropertySheet(&psh) != -1);
+
+    HeapFree(GetProcessHeap(), 0, pGlobalData);

 
 

-    return (LONG)(PropertySheet(&psh) != -1);
+    return ret;

 }
 
 
 }
 
 

diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h
index 34b875e..817a464 100644 (file)
--- a/reactos/dll/cpl/intl/intl.h
+++ b/reactos/dll/cpl/intl/intl.h
@@ -54,6 +54,8 @@ typedef struct _APPLET
 
 typedef struct _GLOBALDATA
 {
 
 typedef struct _GLOBALDATA
 {

+    BOOL bApplyToDefaultUser;
+

     GEOID geoid;
     BOOL fGeoIdChanged;
 
     GEOID geoid;
     BOOL fGeoIdChanged;
 


@@ -70,6 +72,13 @@ extern DWORD UnattendLCID;
 /* intl.c */
 VOID PrintErrorMsgBox(UINT msg);
 
 /* intl.c */
 VOID PrintErrorMsgBox(UINT msg);
 

+VOID
+ResourceMessageBox(
+    HWND hwnd,
+    UINT uType,
+    UINT uCaptionId,
+    UINT uMessageId);
+

 /* languages.c */
 INT_PTR CALLBACK
 LanguagesPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 /* languages.c */
 INT_PTR CALLBACK
 LanguagesPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

diff --git a/reactos/dll/cpl/intl/lang/bg-BG.rc b/reactos/dll/cpl/intl/lang/bg-BG.rc
index 9a92fea..4808332 100644 (file)
--- a/reactos/dll/cpl/intl/lang/bg-BG.rc
+++ b/reactos/dll/cpl/intl/lang/bg-BG.rc
@@ -192,6 +192,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Избор на езици и изписване на числата, валутите, времето и датата."
 END
 
     IDS_CPLDESCRIPTION "Избор на езици и изписване на числата, валутите, времето и датата."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/cs-CZ.rc b/reactos/dll/cpl/intl/lang/cs-CZ.rc
index c3ed322..cf804c6 100644 (file)
--- a/reactos/dll/cpl/intl/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/intl/lang/cs-CZ.rc
@@ -197,6 +197,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Zde lze nastavit zobrazení jazyků, čísel, měn, času a dat."
 END
 
     IDS_CPLDESCRIPTION "Zde lze nastavit zobrazení jazyků, čísel, měn, času a dat."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/de-DE.rc b/reactos/dll/cpl/intl/lang/de-DE.rc
index 179a951..7bbe4b7 100644 (file)
--- a/reactos/dll/cpl/intl/lang/de-DE.rc
+++ b/reactos/dll/cpl/intl/lang/de-DE.rc
@@ -36,8 +36,8 @@ BEGIN
     PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
     GROUPBOX "Zusätzliche Sprachunterstützung", -1, 5, 62, 234, 82
     LTEXT "Die meisten Sprachen sind standardmäßig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontrollkästchen.", -1, 12, 72, 220, 18
     PUSHBUTTON "&Details...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
     GROUPBOX "Zusätzliche Sprachunterstützung", -1, 5, 62, 234, 82
     LTEXT "Die meisten Sprachen sind standardmäßig installiert. Um weitere Sprachen zu installieren, aktivieren Sie die unteren Kontrollkästchen.", -1, 12, 72, 220, 18

-    CHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links-Schreibstil installieren.", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
-    CHECKBOX "Dateien für &ostasiatische Sprachen installieren.", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
+    AUTOCHECKBOX "Dateien für Sprachen mit &komplexer Schrift und Rechts-nach-Links-Schreibstil installieren.", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
+    AUTOCHECKBOX "Dateien für &ostasiatische Sprachen installieren.", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE

 END
 
 IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230
 END
 
 IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230


@@ -52,7 +52,7 @@ BEGIN
     GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88
     CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
     GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30
     GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88
     CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
     GROUPBOX "Standardeinstellungen für Benutzerkonten", -1, 5, 193, 234, 30

-    CHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
+    AUTOCHECKBOX "Einstellungen &auf das aktive und das Standardkonto anwenden.", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE

 END
 
 IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234
 END
 
 IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234


@@ -192,6 +192,15 @@ BEGIN
     IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus."
 END
 
     IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Standardeinstellungen ändern"
+    IDS_APPLY_DEFAULT_TEXT "Die Einstellungen sollen auf das Standardbenutzerprofil angewendet werden.\n\n\
+Diese Änderungen gelten für den Anmeldebildschirm und alle neuen Benutzerkonten.\n\
+Der Computer muss neu gestartet werden, damit die Änderungen für einige Systemdienste\n\
+übernommen werden können."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Fehler"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Fehler"

diff --git a/reactos/dll/cpl/intl/lang/en-US.rc b/reactos/dll/cpl/intl/lang/en-US.rc
index 17f00af..f31676c 100644 (file)
--- a/reactos/dll/cpl/intl/lang/en-US.rc
+++ b/reactos/dll/cpl/intl/lang/en-US.rc
@@ -36,8 +36,8 @@ BEGIN
     PUSHBUTTON "De&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
     GROUPBOX "Additional language support", -1, 5, 62, 234, 82
     LTEXT "Most languages are installed by default. To install additional languages, select the appropriate check box below.", -1, 12, 72, 220, 18
     PUSHBUTTON "De&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14
     GROUPBOX "Additional language support", -1, 5, 62, 234, 82
     LTEXT "Most languages are installed by default. To install additional languages, select the appropriate check box below.", -1, 12, 72, 220, 18

-    CHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
-    CHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE
+    AUTOCHECKBOX "I&nstall files for complex script and right-to-left languages", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22, BS_MULTILINE
+    AUTOCHECKBOX "In&stall files for East Asian languages", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22, BS_MULTILINE

 END
 
 IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230
 END
 
 IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230


@@ -52,7 +52,7 @@ BEGIN
     GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88
     CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
     GROUPBOX "Default user account settings", -1, 5, 193, 234, 30
     GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88
     CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70
     GROUPBOX "Default user account settings", -1, 5, 193, 234, 30

-    CHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE
+    AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22, BS_MULTILINE

 END
 
 IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234
 END
 
 IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234


@@ -192,6 +192,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
 
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/es-ES.rc b/reactos/dll/cpl/intl/lang/es-ES.rc
index 9838db3..10fd4a5 100644 (file)
--- a/reactos/dll/cpl/intl/lang/es-ES.rc
+++ b/reactos/dll/cpl/intl/lang/es-ES.rc
@@ -194,6 +194,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Personaliza la configuración para mostrar idiomas, números, horas y fechas."
 END
 
     IDS_CPLDESCRIPTION "Personaliza la configuración para mostrar idiomas, números, horas y fechas."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/fr-FR.rc b/reactos/dll/cpl/intl/lang/fr-FR.rc
index f9a121b..3bcd54a 100644 (file)
--- a/reactos/dll/cpl/intl/lang/fr-FR.rc
+++ b/reactos/dll/cpl/intl/lang/fr-FR.rc
@@ -194,6 +194,14 @@ BEGIN
   IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date."
 END
 
   IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/he-IL.rc b/reactos/dll/cpl/intl/lang/he-IL.rc
index 23bd782..2debf41 100644 (file)
--- a/reactos/dll/cpl/intl/lang/he-IL.rc
+++ b/reactos/dll/cpl/intl/lang/he-IL.rc
@@ -194,6 +194,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
 
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/it-IT.rc b/reactos/dll/cpl/intl/lang/it-IT.rc
index 2b4f488..e8f7f0f 100644 (file)
--- a/reactos/dll/cpl/intl/lang/it-IT.rc
+++ b/reactos/dll/cpl/intl/lang/it-IT.rc
@@ -194,6 +194,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data."
 END
 
     IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/no-NO.rc b/reactos/dll/cpl/intl/lang/no-NO.rc
index 45032ac..22d7513 100644 (file)
--- a/reactos/dll/cpl/intl/lang/no-NO.rc
+++ b/reactos/dll/cpl/intl/lang/no-NO.rc
@@ -192,6 +192,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Velg språk og nummer format, valuta, tid og dato."
 END
 
     IDS_CPLDESCRIPTION "Velg språk og nummer format, valuta, tid og dato."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/pl-PL.rc b/reactos/dll/cpl/intl/lang/pl-PL.rc
index 8e41051..9dff001 100644 (file)
--- a/reactos/dll/cpl/intl/lang/pl-PL.rc
+++ b/reactos/dll/cpl/intl/lang/pl-PL.rc
@@ -200,6 +200,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Ustawienia języków oraz formaty liczb, walut, daty i czasu."
 END
 
     IDS_CPLDESCRIPTION "Ustawienia języków oraz formaty liczb, walut, daty i czasu."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Błąd"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Błąd"

diff --git a/reactos/dll/cpl/intl/lang/ro-RO.rc b/reactos/dll/cpl/intl/lang/ro-RO.rc
index ea20e7b..4bd74f6 100644 (file)
--- a/reactos/dll/cpl/intl/lang/ro-RO.rc
+++ b/reactos/dll/cpl/intl/lang/ro-RO.rc
@@ -194,6 +194,14 @@ BEGIN
     IDS_CPLDESCRIPTION  "Configurarea limbii și formatarea numerelor, valutelor, datei și orei."
 END
 
     IDS_CPLDESCRIPTION  "Configurarea limbii și formatarea numerelor, valutelor, datei și orei."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Eroare"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Eroare"

diff --git a/reactos/dll/cpl/intl/lang/ru-RU.rc b/reactos/dll/cpl/intl/lang/ru-RU.rc
index 0979e9b..681e0ac 100644 (file)
--- a/reactos/dll/cpl/intl/lang/ru-RU.rc
+++ b/reactos/dll/cpl/intl/lang/ru-RU.rc
@@ -194,6 +194,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Выбор языка, формата чисел, денежных единиц, времени и даты."
 END
 
     IDS_CPLDESCRIPTION "Выбор языка, формата чисел, денежных единиц, времени и даты."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Ошибка"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Ошибка"

diff --git a/reactos/dll/cpl/intl/lang/sk-SK.rc b/reactos/dll/cpl/intl/lang/sk-SK.rc
index dd4fe27..5306e49 100644 (file)
--- a/reactos/dll/cpl/intl/lang/sk-SK.rc
+++ b/reactos/dll/cpl/intl/lang/sk-SK.rc
@@ -198,6 +198,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
 
     IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/sq-AL.rc b/reactos/dll/cpl/intl/lang/sq-AL.rc
index 281588d..02d97be 100644 (file)
--- a/reactos/dll/cpl/intl/lang/sq-AL.rc
+++ b/reactos/dll/cpl/intl/lang/sq-AL.rc
@@ -195,3 +195,26 @@ BEGIN
     IDS_CPLNAME "Alternativat Rajonale"
     IDS_CPLDESCRIPTION "Zgjidhni gjuhën dhe formatin e numrave, monedhat, orën dhe datën."
 END
     IDS_CPLNAME "Alternativat Rajonale"
     IDS_CPLDESCRIPTION "Zgjidhni gjuhën dhe formatin e numrave, monedhat, orën dhe datën."
 END

+
+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ERROR "Error"
+    IDS_ERROR_SYMBOL_SEPARATE "The short date components separator contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_SHORT "The short date format contains incorrect symbol(s)"
+    IDS_ERROR_SYMBOL_FORMAT_LONG "The long date format contains incorrect symbol(s)"
+    IDS_ERROR_OEM_CODE_PAGE "There was a problem reading the OEM code page"
+    IDS_ERROR_ANSI_CODE_PAGE "There was a problem reading the ANSI code page"
+    IDS_ERROR_INT_KEY_REG "Problem opening key: HKCU\\Control Panel\\International"
+    IDS_ERROR_DEF_INT_KEY_REG "Problem opening key: HKU\\.DEFAULT\\Control Panel\\International"
+    IDS_ERROR_NLS_KEY_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"
+    IDS_ERROR_NLS_CODE_REG "Problem opening key: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"
+    IDS_ERROR_INPUT_DLL "Unable to start input.dll"
+END

diff --git a/reactos/dll/cpl/intl/lang/tr-TR.rc b/reactos/dll/cpl/intl/lang/tr-TR.rc
index 4282061..9cb669e 100644 (file)
--- a/reactos/dll/cpl/intl/lang/tr-TR.rc
+++ b/reactos/dll/cpl/intl/lang/tr-TR.rc
@@ -194,6 +194,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Dilleri ve sayı, para birimi, saat ve târih biçimlerini seçer."
 END
 
     IDS_CPLDESCRIPTION "Dilleri ve sayı, para birimi, saat ve târih biçimlerini seçer."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Yanlışlık"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Yanlışlık"

diff --git a/reactos/dll/cpl/intl/lang/uk-UA.rc b/reactos/dll/cpl/intl/lang/uk-UA.rc
index 0c1e13e..89f1c25 100644 (file)
--- a/reactos/dll/cpl/intl/lang/uk-UA.rc
+++ b/reactos/dll/cpl/intl/lang/uk-UA.rc
@@ -200,6 +200,14 @@ BEGIN
     IDS_CPLDESCRIPTION "Налаштування мовних параметрів і формату чисел, грошових одиниць, часу й дат."
 END
 
     IDS_CPLDESCRIPTION "Налаштування мовних параметрів і формату чисел, грошових одиниць, часу й дат."
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"
 STRINGTABLE
 BEGIN
     IDS_ERROR "Error"

diff --git a/reactos/dll/cpl/intl/lang/zh-CN.rc b/reactos/dll/cpl/intl/lang/zh-CN.rc
index db1b3db..667089e 100644 (file)
--- a/reactos/dll/cpl/intl/lang/zh-CN.rc
+++ b/reactos/dll/cpl/intl/lang/zh-CN.rc
@@ -196,6 +196,14 @@ BEGIN
     IDS_CPLDESCRIPTION "选择语言、数字、货币、时间和日期的显示设置。"
 END
 
     IDS_CPLDESCRIPTION "选择语言、数字、货币、时间和日期的显示设置。"
 END
 

+STRINGTABLE
+BEGIN
+    IDS_APPLY_DEFAULT_TITLE "Change default settings"
+    IDS_APPLY_DEFAULT_TEXT "The settings will be applied to the default user account.\n\n\
+These changes apply to the logon screen and new user accounts.\n\
+The computer must be rebooted, in order to apply the changes to some system services."
+END
+

 STRINGTABLE
 BEGIN
     IDS_ERROR "错误"
 STRINGTABLE
 BEGIN
     IDS_ERROR "错误"

diff --git a/reactos/dll/cpl/intl/resource.h b/reactos/dll/cpl/intl/resource.h
index 094297d..2e5b759 100644 (file)
--- a/reactos/dll/cpl/intl/resource.h
+++ b/reactos/dll/cpl/intl/resource.h
@@ -88,3 +88,7 @@
 #define IDS_ERROR_SYMBOL_FORMAT_SHORT 1014
 #define IDS_ERROR_SYMBOL_FORMAT_LONG  1015
 #define IDS_ERROR_INPUT_DLL           1016
 #define IDS_ERROR_SYMBOL_FORMAT_SHORT 1014
 #define IDS_ERROR_SYMBOL_FORMAT_LONG  1015
 #define IDS_ERROR_INPUT_DLL           1016

+
+
+#define IDS_APPLY_DEFAULT_TITLE       1100
+#define IDS_APPLY_DEFAULT_TEXT        1101