[ros-diffs] [mkupfer] 37480: - start with German translation (not finished yet) - prepare setup to change setup language at runtime - fix resource files

Author: mkupfer
Date: Thu Nov 20 04:21:17 2008
New Revision: 37480

URL: http://svn.reactos.org/svn/reactos?rev=37480&view=rev
Log:
- start with German translation (not finished yet)
- prepare setup to change setup language at runtime
- fix resource files

Modified:
    trunk/reactos/base/setup/reactos/lang/de-DE.rc
    trunk/reactos/base/setup/reactos/lang/en-US.rc
    trunk/reactos/base/setup/reactos/reactos.c

Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de…
==============================================================================
--- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Thu Nov 20 04:21:17 2008
@@ -18,11 +18,11 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE
| SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD |
WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
+    CONTROL "Installationssprache:", IDC_STATIC, "Static", WS_CHILD |
WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
     CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static",
WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
+    CONTROL "Tastatur oder Eingabemethode:", IDC_STATIC, "Static",
WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
     CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10
+    LTEXT "Klicken Sie auf Weiter um zum Setuptyp zu gelangen.", IDC_STATIC,
10, 180 ,297, 10
 END
 
 IDD_TYPEPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
@@ -30,10 +30,10 @@
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX,
10,0,297,172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10
-    LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10
+    CONTROL "Setuptyp", IDC_STATIC, "Button", BS_GROUPBOX,
10,0,297,172
+    CONTROL "Installiere ReactOS", IDC_INSTALL, "Button",
BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
+    CONTROL "Repariere oder aktualisiere ein installiertes ReactOS", IDC_SETUP,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10
+    LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 10,
180 ,297, 10
 END
 
 IDD_DEVICEPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
@@ -41,14 +41,14 @@
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX,
10,0,297,172
+    CONTROL "Geräteeinstellungen", IDC_STATIC, "Button", BS_GROUPBOX,
10,0,297,172
     LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10
-    CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 15, 150, 80
-    LTEXT "Display:", IDC_STATIC, 20,35, 80, 10
-    CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 35, 150, 80
-    LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10
-    CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 55, 150, 80
-    LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180
,277, 20
+    CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 15, 180, 80
+    LTEXT "Anzeige:", IDC_STATIC, 20,35, 80, 10
+    CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 35, 180, 80
+    LTEXT "Tastatur:", IDC_STATIC, 20,55, 80, 10
+    CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 55, 180, 80
+    LTEXT "Klicken Sie auf Weiter um Installationsort zu konfigurieren.",
IDC_STATIC, 10, 180 ,277, 20
 END
 
 IDD_DRIVEPAGE DIALOGEX DISCARDABLE  0, 0, 317, 193
@@ -56,29 +56,29 @@
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partition for ReactOS installation", IDC_STATIC,
"Button", BS_GROUPBOX, 10,1,298,176
+    CONTROL "Partition für die ReactOS-Installation", IDC_STATIC,
"Button", BS_GROUPBOX, 10,1,298,176
     LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15
-    PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED
-    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180
,277, 20
+    PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 20,155,50,15
+    PUSHBUTTON "&Löschen", IDC_PARTDELETE, 76,155,50,15
+    PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED
+    PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 218,155,80,15
+    LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.",
IDC_STATIC, 10, 180 ,277, 20
 END
 
 IDD_BOOTOPTIONS DIALOGEX DISCARDABLE  0, 0, 305, 105
 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME
-CAPTION "Advanced Partition Settings"
+CAPTION "Erweiterte Partitionseinstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX,
4,1,298,30
+    CONTROL "Installationsverzeichnis", IDC_STATIC, "Button",
BS_GROUPBOX, 4,1,298,30
     EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE
 
-    CONTROL "Boot loader installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4,36,298,41
+    CONTROL "Bootloader-Installation", IDC_STATIC, "Button",
BS_GROUPBOX, 4,36,298,41
 
-    CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11
-    CONTROL "No installation of bootloader", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11
+    CONTROL "Installiere Bootloader auf Festplatte (MBR)", IDC_INSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11
+    CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR,
"Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11
     PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE
-    PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE
+    PUSHBUTTON "&Abbrechen", IDCANCEL, 240,83,50,15, WS_TABSTOP |
WS_VISIBLE
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
@@ -110,19 +110,19 @@
 
 STRINGTABLE
 BEGIN
-	IDS_LANGTITLE		"Language Selection"
-	IDS_LANGSUBTITLE	"Choose language for setup and final system."
-	IDS_TYPETITLE		"Welcome to ReactOS Setup"
-	IDS_TYPESUBTITLE	"Choose setup type."
-	IDS_DEVICETITLE		"Setup the basic devices"
-	IDS_DEVICESUBTITLE	"Set the settings of display and keyboard."
+	IDS_LANGTITLE		"Sprachauswahl"
+	IDS_LANGSUBTITLE	"Wählen Sie eine Sprache für das Setup und das Endsystem
aus."
+	IDS_TYPETITLE		"Willkommen zum ReactOS Setup"
+	IDS_TYPESUBTITLE	"Wählen Sie einen Setuptyp."
+	IDS_DEVICETITLE		"Einstellen der Basisgeräte"
+	IDS_DEVICESUBTITLE	"Einstellungen der Anzeigegeräte und der Tastatur."
 	IDS_DRIVETITLE		"Setup the installation partition and system folder"
 	IDS_DRIVESUBTITLE	"Prepare installation partition, system folder and boot
loader."
 	IDS_PROCESSTITLE	"Prepare partition, copy files and setup system"
 	IDS_PROCESSSUBTITLE	"Create and format partition, copy files, install and setup
boot loader"
 	IDS_RESTARTTITLE	"First stage of setup finished"
 	IDS_RESTARTSUBTITLE	"The first stage of setup has been completed, restart to
continue with second stage"
-	IDS_ABORTSETUP		"ReactOS is not completely installed on your computer. If you quit
Setup now, you will need to run Setup again to install Reactos. Really quit?"
-	IDS_ABORTSETUP2		"Abort installation?"
+	IDS_ABORTSETUP		"ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn
Sie das Setup verlassen, dann müssen Sie das Setup nochmal ausführen, um ReactOS zu
installieren. Wirklich beenden?"
+	IDS_ABORTSETUP2		"Installation abbrechen?"
 END
 /* EOF */

Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en…
==============================================================================
--- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Thu Nov 20 04:21:17 2008
@@ -43,11 +43,11 @@
 BEGIN
     CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX,
10,0,297,172
     LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10
-    CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 15, 150, 80
+    CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 15, 180, 80
     LTEXT "Display:", IDC_STATIC, 20,35, 80, 10
-    CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 35, 150, 80
+    CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 35, 180, 80
     LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10
-    CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 55, 150, 80
+    CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP |
CBS_DROPDOWNLIST , 100, 55, 180, 80
     LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180
,277, 20
 END
 
@@ -60,9 +60,9 @@
     LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL
     PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15
     PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15
-    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15,
WS_DISABLED
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180
,277, 20
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15
+    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20
 END
 
 IDD_PARTITION DIALOGEX DISCARDABLE  0, 0, 145, 90
@@ -103,6 +103,7 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Installation summary", IDC_ACTION, "Button",
BS_GROUPBOX, 10,0,297,172
+    LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180
,277, 20
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193

Modified: trunk/reactos/base/setup/reactos/reactos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos…
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Thu Nov 20 04:21:17 2008
@@ -344,6 +344,10 @@
 			if (tindex != CB_ERR)
 			{
 				SetupData.SelectedLangId = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex,
(LPARAM)0);
+				WORD LangID=strtol(SetupData.pLanguages[SetupData.SelectedLangId].LangId,NULL,16);
+				SetThreadLocale(MAKELCID(LangID,SORT_DEFAULT));
+				// FIXME: need to reload all resource to force
+				// the new language setting
 			}
 			hList =GetDlgItem(hwndDlg, IDC_KEYLAYOUT); 
 			tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0);
@@ -909,6 +913,7 @@
     		// get default for keyboard and language
 		SetupData.DefaultKBLayout = -1;
 		SetupData.DefaultLang = -1;
+		// TODO: get defaults from underlaying running system
 		if (SetupFindFirstLine(hTxtsetupSif,
_T("NLS"),_T("DefaultLayout"),&InfContext))
 		{
 			SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR),
&LineLength);
@@ -1078,7 +1083,6 @@
   psp.pfnDlgProc = LangSelDlgProc;
   psp.pszTemplate = MAKEINTRESOURCE(IDD_LANGSELPAGE);
   ahpsp[nPages++] = CreatePropertySheetPage(&psp);
-  // Change language with "SetThreadLocale(langid)"
 
   /* Create install type selection page */
   psp.dwSize = sizeof(PROPSHEETPAGE);