1 added + 4 modified, total 5 files
reactos/subsys/system/welcome
diff -N En.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ En.rc 24 Dec 2004 17:19:44 -0000 1.1
@@ -0,0 +1,62 @@
+/* $Id: En.rc,v 1.1 2004/12/24 17:19:44 ekohl Exp $ */
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+/* String Tables */
+
+/* Default settings */
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_APPTITLE "ReactOS - Welcome"
+ IDS_DEFAULTTOPICTITLE "ReactOS"
+ IDS_DEFAULTTOPICDESC "Welcome to React Operating System.\n\nClick a topic on the left."
+// IDS_CHECKTEXT "Show this dialog again"
+// IDS_CLOSETEXT "Exit"
+END
+
+/* Topic buttons */
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_TOPICBUTTON0 "Install ReactOS"
+ IDS_TOPICBUTTON1 "Browse this CD"
+ IDS_TOPICBUTTON2 "Exit"
+// IDS_TOPICBUTTON3 "Empty Topic 3"
+// IDS_TOPICBUTTON4 "Empty Topic 4"
+// IDS_TOPICBUTTON5 "Empty Topic 5"
+// IDS_TOPICBUTTON6 "Empty Topic 6"
+// IDS_TOPICBUTTON7 "Empty Topic 7"
+// IDS_TOPICBUTTON8 "Empty Topic 8"
+// IDS_TOPICBUTTON9 "Empty Topic 9"
+END
+
+/* Topic titles */
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_TOPICTITLE0 "Install ReactOS"
+ IDS_TOPICTITLE1 "Browse this CD"
+ IDS_TOPICTITLE2 "Exit"
+// IDS_TOPICTITLE3 "Empty Topic Title 3"
+// IDS_TOPICTITLE4 "Empty Topic Title 4"
+// IDS_TOPICTITLE5 "Empty Topic Title 5"
+// IDS_TOPICTITLE6 "Empty Topic Title 6"
+// IDS_TOPICTITLE7 "Empty Topic Title 7"
+// IDS_TOPICTITLE8 "Empty Topic Title 8"
+// IDS_TOPICTITLE9 "Empty Topic Title 9"
+END
+
+/* Topic descriptions */
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_TOPICDESC0 "Create a new ReactOS installation on your computer or upgrade an existing installation."
+ IDS_TOPICDESC1 "Browse the CD."
+ IDS_TOPICDESC2 "Click to exit this application."
+// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
+// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
+// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
+// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
+// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
+// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
+// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
+END
+
+/* EOF */
reactos/subsys/system/welcome
diff -u -r1.2 -r1.3
--- .cvsignore 24 Sep 2003 19:55:18 -0000 1.2
+++ .cvsignore 24 Dec 2004 17:19:44 -0000 1.3
@@ -1,3 +1,4 @@
+*.a
*.o
*.d
*.exe
reactos/subsys/system/welcome
diff -u -r1.2 -r1.3
--- De.rc 16 Oct 2004 20:27:42 -0000 1.2
+++ De.rc 24 Dec 2004 17:19:44 -0000 1.3
@@ -1,27 +1,10 @@
-#include <defines.h>
-#include <reactos/resource.h>
-#include "resource.h"
+/* $Id: De.rc,v 1.3 2004/12/24 17:19:44 ekohl Exp $ */
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-
-/* Icons */
-IDI_MAIN ICON "res/welcome.ico"
-
-/* Bitmaps */
-IDB_TITLEBITMAP BITMAP DISCARDABLE "res/title.bmp"
-//IDB_DEFAULTTOPICBITMAP BITMAP DISCARDABLE "res/default.bmp"
-
-//IDB_TOPICBITMAP0 BITMAP DISCARDABLE "res/topic0.bmp"
-//IDB_TOPICBITMAP1 BITMAP DISCARDABLE "res/topic1.bmp"
-//IDB_TOPICBITMAP2 BITMAP DISCARDABLE "res/topic2.bmp"
-//IDB_TOPICBITMAP3 BITMAP DISCARDABLE "res/topic3.bmp"
-//IDB_TOPICBITMAP4 BITMAP DISCARDABLE "res/topic4.bmp"
-//IDB_TOPICBITMAP5 BITMAP DISCARDABLE "res/topic5.bmp"
-//IDB_TOPICBITMAP6 BITMAP DISCARDABLE "res/topic6.bmp"
-//IDB_TOPICBITMAP7 BITMAP DISCARDABLE "res/topic7.bmp"
-//IDB_TOPICBITMAP8 BITMAP DISCARDABLE "res/topic8.bmp"
-//IDB_TOPICBITMAP9 BITMAP DISCARDABLE "res/topic9.bmp"
+/*
+ * German (Austria) resources by Klemens Friedl (frik85 at hotmail dot com)
+ */
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
/* String Tables */
@@ -30,7 +13,7 @@
BEGIN
IDS_APPTITLE "ReactOS - Willkommen"
IDS_DEFAULTTOPICTITLE "ReactOS"
- IDS_DEFAULTTOPICDESC "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema links."
+ IDS_DEFAULTTOPICDESC "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema auf der linken Seite."
// IDS_CHECKTEXT "Dialog beim n�chsen Start wieder anzeigen"
// IDS_CLOSETEXT "Beenden"
END
@@ -68,7 +51,7 @@
/* Topic descriptions */
STRINGTABLE DISCARDABLE
BEGIN
- IDS_TOPICDESC0 "Erstellt eine neue ReactOS Installation auf ihrem PC oder aktualisiert eine bestehende Installation."
+ IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer oder aktualisiert eine bestehende Installation."
IDS_TOPICDESC1 "Die ReactOS-CD durchsuchen."
IDS_TOPICDESC2 "Klicken Sie um dieses Programm zu beenden."
// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
@@ -80,21 +63,5 @@
// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
END
-/* Topic actions */
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_TOPICACTION0 "setup.exe"
- IDS_TOPICACTION1 "explorer.exe"
- IDS_TOPICACTION2 "<exit>" /* this quits the app */
-// IDS_TOPICACTION3 "..."
-// IDS_TOPICACTION4 "..."
-// IDS_TOPICACTION5 "..."
-// IDS_TOPICACTION6 "..."
-// IDS_TOPICACTION7 "..."
-// IDS_TOPICACTION8 "..."
-// IDS_TOPICACTION9 "..."
-END
-
-// German (Austria) resources by Klemens Friedl (frik85 at hotmail dot com)
/* EOF */
reactos/subsys/system/welcome
diff -u -r1.2 -r1.3
--- Es.rc 16 Oct 2004 20:27:42 -0000 1.2
+++ Es.rc 24 Dec 2004 17:19:44 -0000 1.3
@@ -1,28 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
-#include "resource.h"
+/* $Id: Es.rc,v 1.3 2004/12/24 17:19:44 ekohl Exp $ */
LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
-/* Icons */
-IDI_MAIN ICON "res/welcome.ico"
-
-/* Bitmaps */
-IDB_TITLEBITMAP BITMAP DISCARDABLE "res/title.bmp"
-//IDB_DEFAULTTOPICBITMAP BITMAP DISCARDABLE "res/default.bmp"
-
-//IDB_TOPICBITMAP0 BITMAP DISCARDABLE "res/topic0.bmp"
-//IDB_TOPICBITMAP1 BITMAP DISCARDABLE "res/topic1.bmp"
-//IDB_TOPICBITMAP2 BITMAP DISCARDABLE "res/topic2.bmp"
-//IDB_TOPICBITMAP3 BITMAP DISCARDABLE "res/topic3.bmp"
-//IDB_TOPICBITMAP4 BITMAP DISCARDABLE "res/topic4.bmp"
-//IDB_TOPICBITMAP5 BITMAP DISCARDABLE "res/topic5.bmp"
-//IDB_TOPICBITMAP6 BITMAP DISCARDABLE "res/topic6.bmp"
-//IDB_TOPICBITMAP7 BITMAP DISCARDABLE "res/topic7.bmp"
-//IDB_TOPICBITMAP8 BITMAP DISCARDABLE "res/topic8.bmp"
-//IDB_TOPICBITMAP9 BITMAP DISCARDABLE "res/topic9.bmp"
-
-
/* String Tables */
/* Default settings */
@@ -80,20 +59,5 @@
// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
END
-/* Topic actions */
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_TOPICACTION0 "setup.exe"
- IDS_TOPICACTION1 "explorer.exe"
- IDS_TOPICACTION2 "<exit>" /* this quits the app */
-// IDS_TOPICACTION3 "..."
-// IDS_TOPICACTION4 "..."
-// IDS_TOPICACTION5 "..."
-// IDS_TOPICACTION6 "..."
-// IDS_TOPICACTION7 "..."
-// IDS_TOPICACTION8 "..."
-// IDS_TOPICACTION9 "..."
-END
-
/* EOF */
reactos/subsys/system/welcome
diff -u -r1.6 -r1.7
--- welcome.rc 16 Oct 2004 20:27:42 -0000 1.6
+++ welcome.rc 24 Dec 2004 17:19:44 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: welcome.rc,v 1.6 2004/10/16 20:27:42 gvg Exp $ */
+/* $Id: welcome.rc,v 1.7 2004/12/24 17:19:44 ekohl Exp $ */
#include <defines.h>
#include "resource.h"
@@ -8,10 +8,8 @@
#define REACTOS_STR_ORIGINAL_FILENAME "welcome.exe\0"
#include <reactos/version.rc>
-#include "De.rc"
-#include "Es.rc"
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* Icons */
IDI_MAIN ICON "res/welcome.ico"
@@ -32,67 +30,10 @@
//IDB_TOPICBITMAP9 BITMAP DISCARDABLE "res/topic9.bmp"
-/* String Tables */
-
-/* Default settings */
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_APPTITLE "ReactOS - Welcome"
- IDS_DEFAULTTOPICTITLE "ReactOS"
- IDS_DEFAULTTOPICDESC "Welcome to React Operating System.\n\nClick a topic on the left."
-// IDS_CHECKTEXT "Show this dialog again"
-// IDS_CLOSETEXT "Exit"
-END
-
-/* Topic buttons */
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_TOPICBUTTON0 "Install ReactOS"
- IDS_TOPICBUTTON1 "Browse this CD"
- IDS_TOPICBUTTON2 "Exit"
-// IDS_TOPICBUTTON3 "Empty Topic 3"
-// IDS_TOPICBUTTON4 "Empty Topic 4"
-// IDS_TOPICBUTTON5 "Empty Topic 5"
-// IDS_TOPICBUTTON6 "Empty Topic 6"
-// IDS_TOPICBUTTON7 "Empty Topic 7"
-// IDS_TOPICBUTTON8 "Empty Topic 8"
-// IDS_TOPICBUTTON9 "Empty Topic 9"
-END
-
-/* Topic titles */
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_TOPICTITLE0 "Install ReactOS"
- IDS_TOPICTITLE1 "Browse this CD"
- IDS_TOPICTITLE2 "Exit"
-// IDS_TOPICTITLE3 "Empty Topic Title 3"
-// IDS_TOPICTITLE4 "Empty Topic Title 4"
-// IDS_TOPICTITLE5 "Empty Topic Title 5"
-// IDS_TOPICTITLE6 "Empty Topic Title 6"
-// IDS_TOPICTITLE7 "Empty Topic Title 7"
-// IDS_TOPICTITLE8 "Empty Topic Title 8"
-// IDS_TOPICTITLE9 "Empty Topic Title 9"
-END
-
-/* Topic descriptions */
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_TOPICDESC0 "Create a new ReactOS installation on your computer or upgrade an existing installation."
- IDS_TOPICDESC1 "Browse the CD."
- IDS_TOPICDESC2 "Click to exit this application."
-// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
-END
-
/* Topic actions */
STRINGTABLE DISCARDABLE
BEGIN
- IDS_TOPICACTION0 "setup.exe"
+ IDS_TOPICACTION0 "reactos.exe"
IDS_TOPICACTION1 "explorer.exe"
IDS_TOPICACTION2 "<exit>" /* this quits the app */
// IDS_TOPICACTION3 "..."
@@ -103,4 +44,11 @@
// IDS_TOPICACTION8 "..."
// IDS_TOPICACTION9 "..."
END
+
+
+/* Language-specific resources */
+#include "De.rc"
+#include "En.rc"
+#include "Es.rc"
+
/* EOF */
CVSspam 0.2.8