Author: hbelusca Date: Thu Jan 29 23:31:50 2015 New Revision: 66117
URL: http://svn.reactos.org/svn/reactos?rev=66117&view=rev Log: [FOSDEM2015-WELCOME] - Fix compilation - Fix lang files (should be UTF8 w/o BOM) - Translate into French - Do NOT forget that RosBE is now quite incompatible with Windows 2000 !!!
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/CMakeLists.txt branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/CMakeLists.txt [iso-8859-1] Thu Jan 29 23:31:50 2015 @@ -1,5 +1,5 @@
add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui UNICODE) -add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd)
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Thu Jan 29 23:31:50 2015 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
/* String Tables */
@@ -39,8 +39,8 @@ BEGIN IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten müssen, um die Installation zu starten.\n\nAlternativ können Sie ReactOS problemlos in einer virtuellen QEMU-Maschine ausprobieren, wenn Sie den entsprechenden Menüpunkt auf der linken Seite wählen." IDS_TOPICDESC1 "Möglicherweise möchten Sie ein Betriebssystem im Alpha-Stadium nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das Betriebssystem problemlos testen können, ohne dass es direkt auf Ihrem Computer installiert werden muss.\n\nEin Klick auf diesen Menüpunkt öffnet das QEMU-Paket in 7-Zip." - IDS_TOPICDESC2 "Damit ReactOS so einfach wie möglich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthält die passenden Compiler-Versionen und alle nötigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows 2000, XP oder neueren Versionen. Sie wird über diesen Menüpunkt installiert.\nDie CD enthält auch das Build Environment für Unix-ähnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusätzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version." - IDS_TOPICDESC3 "Die CD enthält auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\nEin Klick auf diesen Menüpunkt öffnet ihn in 7-Zip." + IDS_TOPICDESC2 "Damit ReactOS so einfach wie möglich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthält die passenden Compiler-Versionen und alle nötigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows XP oder neueren Versionen. Sie wird über diesen Menüpunkt installiert.\nDie CD enthält auch das Build Environment für Unix-ähnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusätzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version." + IDS_TOPICDESC3 "Die CD enthält auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\n\nEin Klick auf diesen Menüpunkt öffnet ihn in 7-Zip." IDS_TOPICDESC4 "Die ReactOS-Website liefert viele weitere Informationen über das Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezüglich der Entwicklung." IDS_TOPICDESC5 "Durchsuchen Sie den Inhalt dieser CD." IDS_TOPICDESC6 "Beendet das AutoRun-Programm."
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] Thu Jan 29 23:31:50 2015 @@ -7,7 +7,7 @@ BEGIN IDS_APPTITLE "ReactOS 0.3.17+ - FOSDEM 2015" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ReactOS is a modern open source operating system based on the design of Windows® XP/2003. This encompasses full compatibility with Windows applications and drivers as well as a familiar user interface, such that people accustomed to Windows would find using ReactOS straightforward. The source code of the entire system is available for free under several open source licenses, mostly the GNU General Public License." + IDS_DEFAULTTOPICDESC "ReactOS is a modern open source operating system based on the design of Windows® XP/2003. This encompasses full compatibility with Windows applications and drivers as well as a familiar user interface, such that people accustomed to Windows would find using ReactOS straightforward. The source code of the entire system is available for free under several open source licenses, mostly the GNU General Public License." END
/* Topic buttons */ @@ -25,13 +25,13 @@ /* Topic titles */ STRINGTABLE BEGIN - IDS_TOPICTITLE0 "Install ReactOS" - IDS_TOPICTITLE1 "Try out ReactOS in QEMU" - IDS_TOPICTITLE2 "Install ReactOS Build Environment" - IDS_TOPICTITLE3 "Open the ReactOS Source Code Package" - IDS_TOPICTITLE4 "Visit the ReactOS Website" - IDS_TOPICTITLE5 "Browse the CD" - IDS_TOPICTITLE6 "Exit" + IDS_TOPICTITLE0 "Install ReactOS" + IDS_TOPICTITLE1 "Try out ReactOS in QEMU" + IDS_TOPICTITLE2 "Install ReactOS Build Environment" + IDS_TOPICTITLE3 "Open the ReactOS Source Code Package" + IDS_TOPICTITLE4 "Visit the ReactOS Website" + IDS_TOPICTITLE5 "Browse the CD" + IDS_TOPICTITLE6 "Exit" END
/* Topic descriptions */ @@ -39,8 +39,8 @@ BEGIN IDS_TOPICDESC0 "Installs ReactOS on your computer.\n\nPlease note that you have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nAlternatively, you can easily try out ReactOS in a QEMU virtual machine by choosing the respective menu entry on the left side." IDS_TOPICDESC1 "Perhaps you don't want to try out an alpha-stage operating system on your own computer or you face problems during the installation. For these cases, we have preinstalled ReactOS on a QEMU virtual machine. This way, you can try out the operating system without needing to install it on your computer.\n\nA click on this menu entry opens the QEMU package in 7-Zip." - IDS_TOPICDESC2 "To make building ReactOS as easy as possible, the ReactOS Build Environment has been created. This contains the right compiler versions and all needed tools to compile the entire ReactOS Source Code.\n\nThe Windows version of the Build Environment is compatible with Windows 2000, XP or newer versions. It is installed using this menu entry.\n\nAdditionally, the source code of this ReactOS version is included on this CD." - IDS_TOPICDESC3 "The CD also contains the entire source code of this ReactOS version, which can be compiled using the ReactOS Build Environment.\nA click on this menu entry opens it in 7-Zip." + IDS_TOPICDESC2 "To make building ReactOS as easy as possible, the ReactOS Build Environment has been created. This contains the right compiler versions and all needed tools to compile the entire ReactOS Source Code.\n\nThe Windows version of the Build Environment is compatible with Windows XP or newer versions. It is installed using this menu entry.\n\nAdditionally, the source code of this ReactOS version is included on this CD." + IDS_TOPICDESC3 "The CD also contains the entire source code of this ReactOS version, which can be compiled using the ReactOS Build Environment.\n\nA click on this menu entry opens it in 7-Zip." IDS_TOPICDESC4 "The ReactOS Website offers many more information about the project. Here you find the latest ReactOS releases and news regarding the development." IDS_TOPICDESC5 "Browse the contents of this CD." IDS_TOPICDESC6 "Exits the AutoRun program."
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] Thu Jan 29 23:31:50 2015 @@ -7,43 +7,43 @@ BEGIN IDS_APPTITLE "ReactOS 0.3.17+ - FOSDEM 2015" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ReactOS is a modern open source operating system based on the design of Windows® XP/2003. This encompasses full compatibility with Windows applications and drivers as well as a familiar user interface, such that people accustomed to Windows would find using ReactOS straightforward. The source code of the entire system is available for free under several open source licenses, mostly the GNU General Public License." + IDS_DEFAULTTOPICDESC "ReactOS est un système d'exploitation moderne basé sur le design de Windows® XP/2003. Cela signifie une compatibilité totale avec les applications écrites pour Windows, les pilotes de périphériques ainsi qu'une interface utilisateur familière, afin que les personnes habituées à utiliser Windows trouvent ReactOS simple d'utilisation. L'intégralité du code source du système d'exploitation est disponible gratuitement sous diverses licences open source, en majorité la GNU General Public License." END
/* Topic buttons */ STRINGTABLE BEGIN - IDS_TOPICBUTTON0 "Install ReactOS" - IDS_TOPICBUTTON1 "Try out ReactOS in QEMU" - IDS_TOPICBUTTON2 "Install ReactOS Build Environment" - IDS_TOPICBUTTON3 "Open the ReactOS Source Code Package" - IDS_TOPICBUTTON4 "Visit the ReactOS Website" - IDS_TOPICBUTTON5 "Browse the CD" - IDS_TOPICBUTTON6 "Exit" + IDS_TOPICBUTTON0 "Installer ReactOS" + IDS_TOPICBUTTON1 "Essayer ReactOS sous QEMU" + IDS_TOPICBUTTON2 "Installer ReactOS Build Environment" + IDS_TOPICBUTTON3 "Découvrir le code source de ReactOS" + IDS_TOPICBUTTON4 "Visiter le site Web de ReactOS" + IDS_TOPICBUTTON5 "Parcourir le CD" + IDS_TOPICBUTTON6 "Quitter" END
/* Topic titles */ STRINGTABLE BEGIN - IDS_TOPICTITLE0 "Install ReactOS" - IDS_TOPICTITLE1 "Try out ReactOS in QEMU" - IDS_TOPICTITLE2 "Install ReactOS Build Environment" - IDS_TOPICTITLE3 "Open the ReactOS Source Code Package" - IDS_TOPICTITLE4 "Visit the ReactOS Website" - IDS_TOPICTITLE5 "Browse the CD" - IDS_TOPICTITLE6 "Exit" + IDS_TOPICTITLE0 "Installer ReactOS" + IDS_TOPICTITLE1 "Essayer ReactOS sous QEMU" + IDS_TOPICTITLE2 "Installer ReactOS Build Environment" + IDS_TOPICTITLE3 "Découvrir le code source de ReactOS" + IDS_TOPICTITLE4 "Visiter le site Web de ReactOS" + IDS_TOPICTITLE5 "Parcourir le CD" + IDS_TOPICTITLE6 "Quitter" END
/* Topic descriptions */ STRINGTABLE BEGIN - IDS_TOPICDESC0 "Installs ReactOS on your computer.\n\nPlease note that you have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nAlternatively, you can easily try out ReactOS in a QEMU virtual machine by choosing the respective menu entry on the left side." - IDS_TOPICDESC1 "Perhaps you don't want to try out an alpha-stage operating system on your own computer or you face problems during the installation. For these cases, we have preinstalled ReactOS on a QEMU virtual machine. This way, you can try out the operating system without needing to install it on your computer.\n\nA click on this menu entry opens the QEMU package in 7-Zip." - IDS_TOPICDESC2 "To make building ReactOS as easy as possible, the ReactOS Build Environment has been created. This contains the right compiler versions and all needed tools to compile the entire ReactOS Source Code.\n\nThe Windows version of the Build Environment is compatible with Windows 2000, XP or newer versions. It is installed using this menu entry.\n\nAdditionally, the source code of this ReactOS version is included on this CD." - IDS_TOPICDESC3 "The CD also contains the entire source code of this ReactOS version, which can be compiled using the ReactOS Build Environment.\nA click on this menu entry opens it in 7-Zip." - IDS_TOPICDESC4 "The ReactOS Website offers many more information about the project. Here you find the latest ReactOS releases and news regarding the development." - IDS_TOPICDESC5 "Browse the contents of this CD." - IDS_TOPICDESC6 "Exits the AutoRun program." + IDS_TOPICDESC0 "Installe ReactOS sur votre ordinateur.\n\nVeuillez noter que vous aurez besoin de redémarrer votre ordinateur tout en ayant le CD de ReactOS inséré dans le lecteur afin de démarrer l'installation.\n\nAutrement, vous pouvez aisément essayer ReactOS dans une machine virtuelle QEMU en sélectionnant le bouton adéquat dans le menu à gauche." + IDS_TOPICDESC1 "Peut-être vous ne voulez pas essayer un système d'exploitation alpha sur votre propre ordinateur, ou bien vous faites face à des problèmes lors de l'installation. Afin de pallier à ces inconvénients, nous avons préinstallé ReactOS sur une machine virtuelle QEMU. Ainsi, vous pouvez essayer le système d'exploitation sans avoir besoin de l'installer sur votre ordinateur.\n\nUn clic sur ce bouton ouvre le package QEMU avec 7-Zip." + IDS_TOPICDESC2 "Afin de rendre la compilation de ReactOS aussi simple que possible, l'environnement de développement ReactOS (ReactOS Build Environment) a été créé. Il comprend les correctes versions des compilateurs ainsi que les outils nécessaires afin de compiler l'intégralité du code source de ReactOS.\n\nLa version Windows de l'environnement de développement est compatible avec Windows XP ou ultérieur. Elle est installée en cliquant sur ce bouton.\n\nEn supplément, le code source de cette version de ReactOS est inclus dans ce CD." + IDS_TOPICDESC3 "Ce CD contient aussi l'intégralité du code source de cette version de ReactOS qui peut être compilé en utilisant l'environnement de développement ReactOS.\n\nUn clic sur ce bouton ouvre l'archive avec 7-Zip." + IDS_TOPICDESC4 "Le site Web de ReactOS fournit plus d'informations à propos du projet. Vous y trouverez les dernières versions de ReactOS ainsi que des nouvelles concernant son développement." + IDS_TOPICDESC5 "Parcourir le contenu du CD." + IDS_TOPICDESC6 "Quitte le programme AutoRun." END
/* EOF */
Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto... ============================================================================== --- branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/base/setup/welcome/welcome.rc [iso-8859-1] Thu Jan 29 23:31:50 2015 @@ -34,9 +34,9 @@ STRINGTABLE BEGIN IDS_TOPICACTION0 "reactos.exe" - IDS_TOPICACTION1 "..\ReactOS on QEMU\ReactOS-0317-FOSDEM2015-QEMU.7z" - IDS_TOPICACTION2 "..\ReactOS Build Environment\RosBE-2.1.1.exe" - IDS_TOPICACTION3 "..\ReactOS Source Code\ReactOS-0317-FOSDEM2015-Source.7z" + IDS_TOPICACTION1 "..\extras\ReactOS on QEMU\ReactOS-0317-FOSDEM2015-QEMU.7z" + IDS_TOPICACTION2 "..\extras\ReactOS Build Environment\RosBE-2.1.1.exe" + IDS_TOPICACTION3 "..\extras\ReactOS Source Code\ReactOS-0317-FOSDEM2015-Source.7z" IDS_TOPICACTION4 "https://www.reactos.org/" IDS_TOPICACTION5 "explorer.exe" IDS_TOPICACTION6 "<exit>"