Move primary language selection from Input Locale page to General page.

svn path=/trunk/; revision=25890

diff --git a/reactos/dll/cpl/intl/Fr.rc b/reactos/dll/cpl/intl/Fr.rc
index 3a52d59..35afb16 100644 (file)
--- a/reactos/dll/cpl/intl/Fr.rc
+++ b/reactos/dll/cpl/intl/Fr.rc
@@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Général"\r
 FONT 8, "MS Shell Dlg"\r
 BEGIN\r
-  LTEXT "Page de propriétés 1",-1,73,74,90,8\r
+  GROUPBOX "Langue principale", -1, 8, 11, 228, 74\r
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON\r
+  LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22\r
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL\r
 END\r
 \r
 \r
@@ -86,10 +89,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Langues"\r
 FONT 8, "MS Shell Dlg"\r
 BEGIN\r
-  GROUPBOX "Langue principale", -1, 8, 11, 228, 74\r
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON\r
-  LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22\r
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL\r
+\r
 END\r
 \r
 \r

diff --git a/reactos/dll/cpl/intl/Ja.rc b/reactos/dll/cpl/intl/Ja.rc
index 366a6ba..7307356 100644 (file)
--- a/reactos/dll/cpl/intl/Ja.rc
+++ b/reactos/dll/cpl/intl/Ja.rc
@@ -5,7 +5,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "\91S\94Ê"
 FONT 9, "MS UI Gothic"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "\8eg\97p\8c¾\8cê", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "\8eg\97p\82µ\82½\82¢\8c¾\8cê\82Æ\92n\88æ\90Ý\92è\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -83,10 +86,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "\93ü\97Í\8c¾\8cê"
 FONT 9, "MS UI Gothic"
 BEGIN
-  GROUPBOX "\8eg\97p\8c¾\8cê", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "\8eg\97p\82µ\82½\82¢\8c¾\8cê\82Æ\92n\88æ\90Ý\92è\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/cz.rc b/reactos/dll/cpl/intl/cz.rc
index 69ab2dc..a23bbba 100644 (file)
--- a/reactos/dll/cpl/intl/cz.rc
+++ b/reactos/dll/cpl/intl/cz.rc
@@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné nastavení"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hlá\9aení:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -85,10 +88,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Jazyky"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hlá\9aení:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/de.rc b/reactos/dll/cpl/intl/de.rc
index 5e2535a..8359e87 100644 (file)
--- a/reactos/dll/cpl/intl/de.rc
+++ b/reactos/dll/cpl/intl/de.rc
@@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -85,10 +88,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Regionale Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/en.rc b/reactos/dll/cpl/intl/en.rc
index be3f714..a5df084 100644 (file)
--- a/reactos/dll/cpl/intl/en.rc
+++ b/reactos/dll/cpl/intl/en.rc
@@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "Primary language", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -86,10 +89,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Input Locale"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Primary language", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+  LTEXT "Input Locale Page",-1,73,74,90,8
 END
 
 

diff --git a/reactos/dll/cpl/intl/es.rc b/reactos/dll/cpl/intl/es.rc
index 04b2b48..b597f7a 100644 (file)
--- a/reactos/dll/cpl/intl/es.rc
+++ b/reactos/dll/cpl/intl/es.rc
@@ -11,7 +11,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -90,10 +93,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Localidad"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/locale.c b/reactos/dll/cpl/intl/generalp.c
similarity index 98%
rename from reactos/dll/cpl/intl/locale.c
rename to reactos/dll/cpl/intl/generalp.c
index 8c4692f..5caa533 100644 (file)
--- a/reactos/dll/cpl/intl/locale.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -19,8 +19,8 @@
 /* $Id$
  *
  * PROJECT:         ReactOS International Control Panel
- * FILE:            lib/cpl/intl/locale.c
- * PURPOSE:         Locale property page
+ * FILE:            lib/cpl/intl/generalp.c
+ * PURPOSE:         General property page
  * PROGRAMMER:      Eric Kohl
  *                  Klemens Friedl
  *                  Aleksey Bragin
@@ -176,7 +176,7 @@ void SetNewLocale(LCID lcid)
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-LocalePageProc(HWND hwndDlg,
+GeneralPageProc(HWND hwndDlg,
               UINT uMsg,
               WPARAM wParam,
               LPARAM lParam)

diff --git a/reactos/dll/cpl/intl/hu.rc b/reactos/dll/cpl/intl/hu.rc
index f84f90a..5ff0229 100644 (file)
--- a/reactos/dll/cpl/intl/hu.rc
+++ b/reactos/dll/cpl/intl/hu.rc
@@ -6,7 +6,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Általános"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "1. tulajdonságlap",-1,73,74,90,8
+  GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -85,10 +88,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hely megadása"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/general.c b/reactos/dll/cpl/intl/inplocale.c
similarity index 90%
rename from reactos/dll/cpl/intl/general.c
rename to reactos/dll/cpl/intl/inplocale.c
index 847c3ab..3e20dac 100644 (file)
--- a/reactos/dll/cpl/intl/general.c
+++ b/reactos/dll/cpl/intl/inplocale.c
@@ -19,8 +19,8 @@
 /* $Id$
  *
  * PROJECT:         ReactOS International Control Panel
- * FILE:            lib/cpl/intl/general.c
- * PURPOSE:         General property page
+ * FILE:            lib/cpl/intl/inplocale.c
+ * PURPOSE:         Input Locale property page
  * PROGRAMMER:      Eric Kohl
  */
 
@@ -35,7 +35,7 @@
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
-GeneralPageProc(HWND hwndDlg,
+InpLocalePageProc(HWND hwndDlg,
                UINT uMsg,
                WPARAM wParam,
                LPARAM lParam)

diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index 6d6091a..9224449 100644 (file)
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -156,7 +156,7 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
   InitPropSheetPage(&psp[2], IDD_CURRENCYPAGE, CurrencyPageProc);
   InitPropSheetPage(&psp[3], IDD_TIMEPAGE, TimePageProc);
   InitPropSheetPage(&psp[4], IDD_DATEPAGE, DatePageProc);
-  InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, LocalePageProc);
+  InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, InpLocalePageProc);
 
   return (LONG)(PropertySheet(&psh) != -1);
 }

diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h
index f557a45..d1017c7 100644 (file)
--- a/reactos/dll/cpl/intl/intl.h
+++ b/reactos/dll/cpl/intl/intl.h
@@ -36,7 +36,7 @@ GeneralPageProc(HWND hwndDlg,
 
 /* locale.c */
 INT_PTR CALLBACK
-LocalePageProc(HWND hwndDlg,
+InpLocalePageProc(HWND hwndDlg,
               UINT uMsg,
               WPARAM wParam,
               LPARAM lParam);

diff --git a/reactos/dll/cpl/intl/intl.rbuild b/reactos/dll/cpl/intl/intl.rbuild
index 6297017..b8c7537 100644 (file)
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@@ -15,9 +15,9 @@
        <library>msvcrt</library>
        <file>currency.c</file>
        <file>date.c</file>
-       <file>general.c</file>
+       <file>generalp.c</file>
        <file>intl.c</file>
-       <file>locale.c</file>
+       <file>inplocale.c</file>
        <file>numbers.c</file>
        <file>time.c</file>
        <file>intl.rc</file>

diff --git a/reactos/dll/cpl/intl/it.rc b/reactos/dll/cpl/intl/it.rc
index 7f4e51c..83def94 100644 (file)
--- a/reactos/dll/cpl/intl/it.rc
+++ b/reactos/dll/cpl/intl/it.rc
@@ -8,7 +8,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generale"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Pagina delle proprietà 1",-1,73,74,90,8
+  GROUPBOX "Lingua principale", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -87,10 +90,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Input Locale"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Lingua principale", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/nl.rc b/reactos/dll/cpl/intl/nl.rc
index 4e49f66..a2f17ff 100644 (file)
--- a/reactos/dll/cpl/intl/nl.rc
+++ b/reactos/dll/cpl/intl/nl.rc
@@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Algemeen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "Eerste taal", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -86,10 +89,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Invoer"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Eerste taal", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/ru.rc b/reactos/dll/cpl/intl/ru.rc
index 4994f35..ff2acd8 100644 (file)
--- a/reactos/dll/cpl/intl/ru.rc
+++ b/reactos/dll/cpl/intl/ru.rc
@@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Îáùèå"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Âêëàäêà 1",-1,73,74,90,8
+  GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -86,10 +89,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "ßçûêè è ðàñêëàäêè"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/sv.rc b/reactos/dll/cpl/intl/sv.rc
index 705e0e7..c0adb07 100644 (file)
--- a/reactos/dll/cpl/intl/sv.rc
+++ b/reactos/dll/cpl/intl/sv.rc
@@ -8,7 +8,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Generellt"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "Property Page 1",-1,73,74,90,8
+  GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -87,10 +90,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Inmatningsspråk"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END
 
 

diff --git a/reactos/dll/cpl/intl/uk.rc b/reactos/dll/cpl/intl/uk.rc
index 2e5bf56..11e89a9 100644 (file)
--- a/reactos/dll/cpl/intl/uk.rc
+++ b/reactos/dll/cpl/intl/uk.rc
@@ -14,7 +14,10 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 EXSTYLE DS_SHELLFONT
 BEGIN
-  LTEXT "Âêëàäêà âëàñòèâîñòåé 1",-1,73,74,90,8
+  GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74
+  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
+  LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22
+  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
 END
 
 
@@ -93,10 +96,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ìîâè ³ ðîçêëàäêè"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74
-  ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
-  LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22
-  COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
+
 END