Author: cfinck
Date: Thu Jun 21 23:03:55 2007
New Revision: 27255
URL: http://svn.reactos.org/svn/reactos?rev=27255&view=rev
Log:
Add the links to the RosCMS v2 Interfaces until RosCMS v3 is fully ready
Modified:
trunk/web/reactos.org/htdocs/roscms/inc/home.php
Modified: trunk/web/reactos.org/htdocs/roscms/inc/home.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/…
==============================================================================
--- trunk/web/reactos.org/htdocs/roscms/inc/home.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/home.php Thu Jun 21 23:03:55 2007
@@ -27,6 +27,21 @@
}
else {
?>
+ <h4>RosCMS v3 Information</h4>
+ <p>
+ We are currently testing a new version 3 of our Content Management System RosCMS on the ReactOS-Website.<br><br>
+
+ If you want to edit something, please use the old interfaces until RosCMS v3 is fully ready:
+ <ul>
+ <?php
+ if ($roscms_intern_usrgrp_trans == true) { ?><li><a href="?page=trans">Translator Interface</a></li><?php }
+ if ($roscms_intern_usrgrp_team == true) { ?><li><a href="?page=team">Team Interface</a></li><?php }
+ if ($roscms_intern_usrgrp_dev == true) { ?><li><a href="?page=dev">Developer Interface</a></li><?php }
+ if ($roscms_intern_usrgrp_admin == true) { ?><li><a href="?page=admin">Admin Interface</a></li><?php }
+ ?>
+ </ul>
+ </p>
+
<h4>Translator Information</h4>
<p>Language maintainer contact information [...]</p>
<?php
Author: cfinck
Date: Thu Jun 21 19:23:49 2007
New Revision: 27250
URL: http://svn.reactos.org/svn/reactos?rev=27250&view=rev
Log:
Re-add the "lake.bmp" wallpaper inclusion (partly imported from the deleted 0.3.1 branch, r26044)
The wallpaper is now also added to the %SystemRoot% directory instead of %SystemRoot%\system32
The only thing I did not import is the setting of the default wallpaper in "hivedef.inf". For 0.3.1, we hardcoded the full path to the wallpaper in the "hivedef.inf" file.
For 0.3.3, we should either do this only in the branch or better implement a proper solution like setting the path in 2nd stage setup.
Modified:
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/modules/directory.rbuild
trunk/wallpaper/directory.rbuild
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Jun 21 19:23:49 2007
@@ -507,3 +507,4 @@
modules\rostests\winetests\user32\user32_winetest.exe 7 optional
modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional
modules\rostests\winetests\version\version_winetest.exe 7 optional
+modules\wallpaper\lake.bmp 4 optional
Modified: trunk/reactos/modules/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/directory.rbuild?r…
==============================================================================
--- trunk/reactos/modules/directory.rbuild (original)
+++ trunk/reactos/modules/directory.rbuild Thu Jun 21 19:23:49 2007
@@ -41,6 +41,13 @@
</xi:fallback>
</xi:include>
</directory>
+ <directory name="wallpaper">
+ <xi:include href="wallpaper/directory.rbuild">
+ <xi:fallback>
+ <xi:include href="empty.rbuild" />
+ </xi:fallback>
+ </xi:include>
+ </directory>
<directory name="windows">
<xi:include href="windows/directory.rbuild">
<xi:fallback>
Modified: trunk/wallpaper/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/wallpaper/directory.rbuild?rev=272…
==============================================================================
--- trunk/wallpaper/directory.rbuild (original)
+++ trunk/wallpaper/directory.rbuild Thu Jun 21 19:23:49 2007
@@ -1,3 +1,3 @@
<group>
- <installfile base="system32">lake.bmp</installfile>
+ <installfile>lake.bmp</installfile>
</group>
Author: cfinck
Date: Thu Jun 21 17:06:28 2007
New Revision: 27249
URL: http://svn.reactos.org/svn/reactos?rev=27249&view=rev
Log:
Finally fix the left/right confusion in all translations
Modified:
trunk/rosapps/downloader/translations/de.rc
trunk/rosapps/downloader/translations/en.rc
trunk/rosapps/downloader/translations/fr.rc
trunk/rosapps/downloader/translations/id.rc
trunk/rosapps/downloader/translations/it.rc
Modified: trunk/rosapps/downloader/translations/de.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/de…
==============================================================================
--- trunk/rosapps/downloader/translations/de.rc (original)
+++ trunk/rosapps/downloader/translations/de.rc Thu Jun 21 17:06:28 2007
@@ -14,7 +14,7 @@
BEGIN
IDS_WINDOW_TITLE "Download ! - ReactOS Downloader"
IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader"
- IDS_WELCOME "Bitte wählen Sie rechts eine Kategorie. Dies ist Version 1.0."
+ IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.0."
IDS_NO_APP_TITLE "Keine Anwendung ausgewählt"
IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke."
IDS_UPDATE_TITLE "Update"
Modified: trunk/rosapps/downloader/translations/en.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/en…
==============================================================================
--- trunk/rosapps/downloader/translations/en.rc (original)
+++ trunk/rosapps/downloader/translations/en.rc Thu Jun 21 17:06:28 2007
@@ -14,7 +14,7 @@
BEGIN
IDS_WINDOW_TITLE "Download ! - ReactOS Downloader"
IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader"
- IDS_WELCOME "Please choose a category on the right. This is version 1.0."
+ IDS_WELCOME "Please choose a category on the left. This is version 1.0."
IDS_NO_APP_TITLE "No application selected"
IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner."
IDS_UPDATE_TITLE "Update"
Modified: trunk/rosapps/downloader/translations/fr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/fr…
==============================================================================
--- trunk/rosapps/downloader/translations/fr.rc (original)
+++ trunk/rosapps/downloader/translations/fr.rc Thu Jun 21 17:06:28 2007
@@ -14,13 +14,13 @@
BEGIN
IDS_WINDOW_TITLE "Télécharger ! - Téléchargeur de ReactOS"
IDS_WELCOME_TITLE "Bienvenue dans le Téléchargeur de ReactOS"
- IDS_WELCOME "Veuillez choisir une catégorie sur la droite. C'est la version 1.0."
+ IDS_WELCOME "Veuillez choisir une catégorie sur la gauche. C'est la version 1.0."
IDS_NO_APP_TITLE "Aucune application selectionnée"
IDS_NO_APP "Veuillez sélectionner une application avant de cliquer sur le bouton Télécharger, si vous avez besoin d'aide, veuillez cliquer sur le point d'interrogation dans le coin supérieur droit."
IDS_UPDATE_TITLE "Mise à jour"
IDS_UPDATE "Désolé, cette fonctionnalité n'est pas encore implémentée."
IDS_HELP_TITLE "Aide"
- IDS_HELP "Choisissez une catégorie sur la droite, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide."
+ IDS_HELP "Choisissez une catégorie sur la gauche, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide."
IDS_NO_APPS "Désolé, il n'y a pas encore d'application dans cette catégorie. Vous pouvez contribuer et ajouter plus d'applications."
IDS_CHOOSE_APP "Veuillez choisir une application."
IDS_CHOOSE_SUB "Veuillez choisir une sous-catégorie."
Modified: trunk/rosapps/downloader/translations/id.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/id…
==============================================================================
--- trunk/rosapps/downloader/translations/id.rc (original)
+++ trunk/rosapps/downloader/translations/id.rc Thu Jun 21 17:06:28 2007
@@ -14,7 +14,7 @@
BEGIN
IDS_WINDOW_TITLE "Download ! - ReactOS Downloader"
IDS_WELCOME_TITLE "Selamat datang di ReactOS Downloader"
- IDS_WELCOME "Silahkan pilih kategori di sebelah kanan. Ini versi 1.0."
+ IDS_WELCOME "Silahkan pilih kategori di sebelah kiri. Ini versi 1.0."
IDS_NO_APP_TITLE "Tidak ada aplikasi yang dipilih"
IDS_NO_APP "Silahkan pilih Aplikasi sebelum anda mengklik tombol download, jika anda membutuhkan asistensi silahkan klik pada tombol di sudut kanan atas."
IDS_UPDATE_TITLE "Mutakhirkan"
Modified: trunk/rosapps/downloader/translations/it.rc
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/it…
==============================================================================
--- trunk/rosapps/downloader/translations/it.rc (original)
+++ trunk/rosapps/downloader/translations/it.rc Thu Jun 21 17:06:28 2007
@@ -14,13 +14,13 @@
BEGIN
IDS_WINDOW_TITLE "Download ! - ReactOS Downloader"
IDS_WELCOME_TITLE "Benvenuto al ReactOS Downloader"
- IDS_WELCOME "Scegli una categoria a destra. Questa è la versione 1.0."
+ IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.0."
IDS_NO_APP_TITLE "Nessuna applicazione selezionata"
IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra."
IDS_UPDATE_TITLE "Aggiona"
IDS_UPDATE "Funzione non ancora implementata."
IDS_HELP_TITLE "Aiuto"
- IDS_HELP "Scegli una categoria a destra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto."
+ IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto."
IDS_NO_APPS "Non ci sono ancora applicazioni in questa categoria. Puoi aiutare aggiungendone altre."
IDS_CHOOSE_APP "Scegli una applicazione."
IDS_CHOOSE_SUB "Scegli una sottocategoria."
Author: cfinck
Date: Thu Jun 21 16:27:36 2007
New Revision: 27248
URL: http://svn.reactos.org/svn/reactos?rev=27248&view=rev
Log:
Change the "ReactOS (R) Version 5.2 ..." boot message to "ReactOS (R) Kernel Version 5.2 ...", so people don't get confused by the different version numbers of the Kernel and ReactOS itself
Modified:
trunk/reactos/ntoskrnl/ntoskrnl.mc
Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=2…
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.mc (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.mc Thu Jun 21 16:27:36 2007
@@ -1345,7 +1345,7 @@
Facility=System
SymbolicName=WINDOWS_NT_BANNER
Language=English
-ReactOS (R) Version %hs (Build %u%hs)
+ReactOS (R) Kernel Version %hs (Build %u%hs)
.
MessageId=0x87