Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-10 22:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=25890
This commit is contained in:
Saveliy Tretiakov 2007-02-23 09:35:32 +00:00
parent 82acba718f
commit 0446badad8
17 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/cpl/intl/Fr.rc
View file

@ -7,7 +7,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Général"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Page de propriétés 1",-1,73,74,90,8
GROUPBOX "Langue principale", -1, 8, 11, 228, 74
ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -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 "Langues"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Langue principale", -1, 8, 11, 228, 74
ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON
LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -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

10
reactos/dll/cpl/intl/Ja.rc
View file

@ -5,7 +5,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "‘S”Ê"
FONT 9, "MS UI Gothic"
BEGIN
LTEXT "Property Page 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
@ -83,10 +86,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "“ü—ÍŒ¾Œê"
FONT 9, "MS UI Gothic"
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

10
reactos/dll/cpl/intl/cz.rc
View file

@ -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ášení:", -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ášení:", -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

10
reactos/dll/cpl/intl/de.rc
View file

@ -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

10
reactos/dll/cpl/intl/en.rc
View file

@ -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

10
reactos/dll/cpl/intl/es.rc
View file

@ -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

6
reactos/dll/cpl/intl/locale.c → reactos/dll/cpl/intl/generalp.c
View file

@ -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)

10
reactos/dll/cpl/intl/hu.rc
View file

@ -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

6
reactos/dll/cpl/intl/general.c → reactos/dll/cpl/intl/inplocale.c
View file

@ -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)

2
reactos/dll/cpl/intl/intl.c
View file

@ -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);
}

2
reactos/dll/cpl/intl/intl.h
View file

@ -36,7 +36,7 @@ GeneralPageProc(HWND hwndDlg,
/* locale.c */
INT_PTR CALLBACK
LocalePageProc(HWND hwndDlg,
InpLocalePageProc(HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
LPARAM lParam);

4
reactos/dll/cpl/intl/intl.rbuild
View file

@ -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>

10
reactos/dll/cpl/intl/it.rc
View file

@ -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

10
reactos/dll/cpl/intl/nl.rc
View file

@ -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

10
reactos/dll/cpl/intl/ru.rc
View file

@ -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

10
reactos/dll/cpl/intl/sv.rc
View file

@ -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

10
reactos/dll/cpl/intl/uk.rc
View file

@ -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