Commit in reactos/lib/syssetup on MAIN
syssetup_Cz.rc+40-61.9 -> 1.10
syssetup_De.rc+321.8 -> 1.9
syssetup_En.rc+2-21.11 -> 1.12
syssetup_Fr.rc+321.6 -> 1.7
+106-8
4 modified files
Add acknowledgement page and license dialog and update title strings.

reactos/lib/syssetup
syssetup_Cz.rc 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- syssetup_Cz.rc	11 Nov 2004 12:23:43 -0000	1.9
+++ syssetup_Cz.rc	24 Nov 2004 21:28:14 -0000	1.10
@@ -31,6 +31,25 @@
 END
 
 
+IDD_ACKPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "The ReactOS developers would like to acknowledge the following Open Source projects, "\
+                    "(parts of) which were used to create ReactOS:",
+                    IDC_STATIC,15,7,286,19
+    LISTBOX         IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+    LTEXT           "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\
+                    "(parts of) it you must respect the GPL",
+                    IDC_STATIC,15,110,227,19
+    PUSHBUTTON      "&View GPL...",IDC_VIEWGPL,251,110,50,19
+    LTEXT           "Click Next to continue with Setup.",IDC_STATIC,15,136,
+                    195,17
+END
+
+
 IDD_OWNERPAGE DIALOG DISCARDABLE  0, 0, 317, 143
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -143,14 +162,29 @@
 END
 
 
+IDD_GPL DIALOG 0, 0, 333, 230
+STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "GNU General Public License"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT        IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | 
+                    ES_READONLY | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,141,209,50,14
+END
+
+
 STRINGTABLE
 BEGIN
-    IDS_OWNERTITLE       "Owner page title"
-    IDS_OWNERSUBTITLE    "Owner page subtitle"
-    IDS_COMPUTERTITLE    "Computer page title"
-    IDS_COMPUTERSUBTITLE "Computer page subtitle"
-    IDS_LOCALETITLE      "Locale page title"
-    IDS_LOCALESUBTITLE   "Locale page subtitle"
+    IDS_ACKTITLE         "Acknowledgements"
+    IDS_ACKSUBTITLE      "The shoulders ReactOS stands on and license information"
+    IDS_OWNERTITLE       "Personalize your Software"
+    IDS_OWNERSUBTITLE    "Setup uses this information about yourself to personalize ReactOS."
+    IDS_COMPUTERTITLE    "Computer Name and Administrator Password"
+    IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer."
+    IDS_LOCALETITLE      "Regional settings"
+    IDS_LOCALESUBTITLE   "You can customize ReactOS for different regions and languages."
+    IDS_DATETIMETITLE    "Date and Time"
+    IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE     "Process page title"
     IDS_PROCESSSUBTITLE  "Process page subtitle"
 END

reactos/lib/syssetup
syssetup_De.rc 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- syssetup_De.rc	11 Nov 2004 12:23:43 -0000	1.8
+++ syssetup_De.rc	24 Nov 2004 21:28:14 -0000	1.9
@@ -33,6 +33,25 @@
 END
 
 
+IDD_ACKPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "The ReactOS developers would like to acknowledge the following Open Source projects, "\
+                    "(parts of) which were used to create ReactOS:",
+                    IDC_STATIC,15,7,286,19
+    LISTBOX         IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+    LTEXT           "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\
+                    "(parts of) it you must respect the GPL",
+                    IDC_STATIC,15,110,227,19
+    PUSHBUTTON      "&View GPL...",IDC_VIEWGPL,251,110,50,19
+    LTEXT           "Click Next to continue with Setup.",IDC_STATIC,15,136,
+                    195,17
+END
+
+
 IDD_OWNERPAGE DIALOG DISCARDABLE  0, 0, 317, 143
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -147,8 +166,21 @@
 END
 
 
+IDD_GPL DIALOG 0, 0, 333, 230
+STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "GNU General Public License"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT        IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | 
+                    ES_READONLY | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,141,209,50,14
+END
+
+
 STRINGTABLE
 BEGIN
+    IDS_ACKTITLE         "Acknowledgements"
+    IDS_ACKSUBTITLE      "The shoulders ReactOS stands on and license information"
     IDS_OWNERTITLE       "Personalize your Software"
     IDS_OWNERSUBTITLE    "Setup uses this information about yourself to personalize ReactOS."
     IDS_COMPUTERTITLE    "Computer Name and Administrator Password"

reactos/lib/syssetup
syssetup_En.rc 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- syssetup_En.rc	22 Nov 2004 20:35:56 -0000	1.11
+++ syssetup_En.rc	24 Nov 2004 21:28:14 -0000	1.12
@@ -34,8 +34,7 @@
 
 
 IDD_ACKPAGE DIALOGEX 0, 0, 317, 143
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -167,6 +166,7 @@
     PUSHBUTTON "&Restart", IDOK, 98, 87, 50, 14
 END
 
+
 IDD_GPL DIALOG 0, 0, 333, 230
 STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "GNU General Public License"

reactos/lib/syssetup
syssetup_Fr.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- syssetup_Fr.rc	11 Nov 2004 12:23:43 -0000	1.6
+++ syssetup_Fr.rc	24 Nov 2004 21:28:14 -0000	1.7
@@ -34,6 +34,25 @@
 END
 
 
+IDD_ACKPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "The ReactOS developers would like to acknowledge the following Open Source projects, "\
+                    "(parts of) which were used to create ReactOS:",
+                    IDC_STATIC,15,7,286,19
+    LISTBOX         IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+    LTEXT           "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\
+                    "(parts of) it you must respect the GPL",
+                    IDC_STATIC,15,110,227,19
+    PUSHBUTTON      "&View GPL...",IDC_VIEWGPL,251,110,50,19
+    LTEXT           "Click Next to continue with Setup.",IDC_STATIC,15,136,
+                    195,17
+END
+
+
 IDD_OWNERPAGE DIALOG DISCARDABLE  0, 0, 317, 143
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installation de ReactOS"
@@ -148,8 +167,21 @@
 END
 
 
+IDD_GPL DIALOG 0, 0, 333, 230
+STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "GNU General Public License"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT        IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | 
+                    ES_READONLY | WS_VSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,141,209,50,14
+END
+
+
 STRINGTABLE
 BEGIN
+    IDS_ACKTITLE         "Acknowledgements"
+    IDS_ACKSUBTITLE      "The shoulders ReactOS stands on and license information"
     IDS_OWNERTITLE       "Personalize your Software"
     IDS_OWNERSUBTITLE    "Setup uses this information about yourself to personalize ReactOS."
     IDS_COMPUTERTITLE    "Computer Name and Administrator Password"
CVSspam 0.2.8