Integrate the USERINIT changes r75295, r75302 and r75303 from the setup_improvements...

[reactos.git] / reactos / base / system / userinit / lang / de-DE.rc

diff --git a/reactos/base/system/userinit/lang/de-DE.rc b/reactos/base/system/userinit/lang/de-DE.rc
index cf62fc2..181b23a 100644 (file)
--- a/reactos/base/system/userinit/lang/de-DE.rc
+++ b/reactos/base/system/userinit/lang/de-DE.rc
@@ -1,42 +1,43 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8
 
-    GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+    CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1
     DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
     PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
-    LTEXT "", IDC_STATIC, 7, 152, 300, 8
+    // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
-    GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+    CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1
     PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
     PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
 END
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you choose to do so, your computer might restart."
 END
 
 STRINGTABLE