[ros-diffs] [janderwald] 24940: - shuffle resource files a bit

Author: janderwald
Date: Tue Nov 28 23:19:18 2006
New Revision: 24940

URL: http://svn.reactos.org/svn/reactos?rev=24940&view=rev
Log:
- shuffle resource files a bit

Added:
    trunk/reactos/base/applications/sm/lang/
    trunk/reactos/base/applications/sm/lang/de-DE.rc
      - copied unchanged from r24939, trunk/reactos/base/applications/sm/de-DE.rc
    trunk/reactos/base/applications/sm/lang/en-US.rc
      - copied unchanged from r24939, trunk/reactos/base/applications/sm/en-US.rc
    trunk/reactos/base/applications/sm/lang/hu-HU.rc
      - copied unchanged from r24939, trunk/reactos/base/applications/sm/hu-HU.rc
    trunk/reactos/base/applications/sm/lang/ja-JP.rc
      - copied unchanged from r24939, trunk/reactos/base/applications/sm/ja-JP.rc
    trunk/reactos/base/applications/sm/lang/nb-NO.rc
      - copied unchanged from r24939, trunk/reactos/base/applications/sm/nb-NO.rc
    trunk/reactos/base/applications/sm/lang/ru-RU.rc
      - copied unchanged from r24939, trunk/reactos/base/applications/sm/ru-RU.rc
    trunk/reactos/base/applications/sm/rsrc.rc   (with props)
Removed:
    trunk/reactos/base/applications/sm/de-DE.rc
    trunk/reactos/base/applications/sm/en-US.rc
    trunk/reactos/base/applications/sm/hu-HU.rc
    trunk/reactos/base/applications/sm/ja-JP.rc
    trunk/reactos/base/applications/sm/nb-NO.rc
    trunk/reactos/base/applications/sm/ru-RU.rc
Modified:
    trunk/reactos/base/applications/sm/sm.rc

Removed: trunk/reactos/base/applications/sm/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/de-DE…
==============================================================================
--- trunk/reactos/base/applications/sm/de-DE.rc (original)
+++ trunk/reactos/base/applications/sm/de-DE.rc (removed)
@@ -1,56 +1,0 @@
-#include "resource.h"
-/*
- * German language file by Daniel Reimer <EmuandCo> 2006-06-15 
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-STRINGTABLE DISCARDABLE
-{
-IDS_boot, "boot subsystem_name" 
-
-IDS_help, "help [command]"
-
-IDS_info, "info [subsystem_id]"
-
-IDS_reboot, "reboot subsystem_id"
-
-IDS_shutdown,"shutdown subsystem_id"
-
-
-
-IDS_boot_msg, "bootstrap an optional environment subsystem;"
-
-IDS_help_msg, "print help for command;"
-
-IDS_info_msg,   "print information about a booted subsystem\n\
-if subsystem_id is omitted, a list of booted\n\
-environment subsystems is printed."
-
-IDS_reboot_msg,  "reboot an optional environment subsystem;"
-IDS_shutdown_msg, "shutdown an optional environment subsystem;"
-
-IDS_Unknown, "Unknown command '%s'.\n"
-
-IDS_SM1,  "SM SubSystem Directory\n\n\
-SSID PID      Flags\n\
----- -------- ------------\n"
-
-IDS_SM2, "%04x %08lx %04x\n"
-
-IDS_ID, "SubSystem ID: %d\n\
-       Flags: %04x\n\
-  Process ID: %ld\n"
-
-IDS_Not_Imp,  "not implemented\n"
-
-IDS_Mangers, "ReactOS/Win32 - Session Manager Control Tool\n\n"
-
-IDS_USING, "Usage:\n\
-\tsm\n\
-\tsm help [command]\n\
-\tsm command [arguments]\n\n'sm help' will print the list of valid
commands.\n"
-
-IDS_FAILS_MNG, "Failed to connect to the Session Manager! (Status=0x%08lx)\n"
-}

Removed: trunk/reactos/base/applications/sm/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/en-US…
==============================================================================
--- trunk/reactos/base/applications/sm/en-US.rc (original)
+++ trunk/reactos/base/applications/sm/en-US.rc (removed)
@@ -1,55 +1,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- */
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-STRINGTABLE DISCARDABLE
-{
-IDS_boot, "boot subsystem_name" 
-
-IDS_help, "help [command]"
-
-IDS_info, "info [subsystem_id]"
-
-IDS_reboot, "reboot subsystem_id"
-
-IDS_shutdown,"shutdown subsystem_id"
-
-
-
-IDS_boot_msg, "bootstrap an optional environment subsystem;"
-
-IDS_help_msg, "print help for command;"
-
-IDS_info_msg,   "print information about a booted subsystem\n\
-if subsystem_id is omitted, a list of booted\n\
-environment subsystems is printed."
-
-IDS_reboot_msg,  "reboot an optional environment subsystem;"
-IDS_shutdown_msg, "shutdown an optional environment subsystem;"
-
-IDS_Unknown, "Unknown command '%s'.\n"
-
-IDS_SM1,  "SM SubSystem Directory\n\n\
-SSID PID      Flags\n\
----- -------- ------------\n"
-
-IDS_SM2, "%04x %08lx %04x\n"
-
-IDS_ID, "SubSystem ID: %d\n\
-       Flags: %04x\n\
-  Process ID: %ld\n"
-
-IDS_Not_Imp,  "not implemented\n"
-
-IDS_Mangers, "ReactOS/Win32 - Session Manager Control Tool\n\n"
-
-IDS_USING, "Usage:\n\
-\tsm\n\
-\tsm help [command]\n\
-\tsm command [arguments]\n\n'sm help' will print the list of valid
commands.\n"
-
-IDS_FAILS_MNG, "Failed to connect to the Session Manager! (Status=0x%08lx)\n"
-}

Removed: trunk/reactos/base/applications/sm/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/hu-HU…
==============================================================================
--- trunk/reactos/base/applications/sm/hu-HU.rc (original)
+++ trunk/reactos/base/applications/sm/hu-HU.rc (removed)
@@ -1,54 +1,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- * Hungarian translation by Robert Horvath - talley at cubeclub.hu
- */
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-{
-IDS_boot, "boot alrendszer_név" 
-
-IDS_help, "help [parancs]"
-
-IDS_info, "info [alrendszer_azonosító]"
-
-IDS_reboot, "alrendszer_azonosító újraindítása"
-
-IDS_shutdown,"alrendszer_azonosító leállítása"
-
-
-
-IDS_boot_msg, "bootstrap an optional environment subsystem;"
-
-IDS_help_msg, "print help for command;"
-
-IDS_info_msg,   "Információk az elindított alrendszerrõl\n\Ha subsystem_id nincs
megadva, az elindított\n\alrendszerek információi jelennek meg."
-
-IDS_reboot_msg,  "Egy opcionális alrendszer újraindítása;"
-IDS_shutdown_msg, "Egy opcionális alrendszer lekapcsolása;"
-
-IDS_Unknown, "Ismeretlen parancs: '%s'.\n"
-
-IDS_SM1,  "SM alrendszer mappa\n\n\
-SSID PID      Flags\n\
----- -------- ------------\n"
-
-IDS_SM2, "%04x %08lx %04x\n"
-
-IDS_ID, "Alrendszer azonosító: %d\n\
-       Flags: %04x\n\
-  Folyamat azonosító: %ld\n"
-
-IDS_Not_Imp,  "A parancs nincs támogatva\n"
-
-IDS_Mangers, "ReactOS/Win32 - Munkamenet vezérlõ\n\n"
-
-IDS_USING, "Használat:\n\
-\tsm\n\
-\tsm help [command]\n\
-\tsm parancs [paraméterek]\n\n'sm help' megjeleníti a támogatott
parancsokat.\n"
-
-IDS_FAILS_MNG, "Sikertelen kapcsolat felvétel a munkamenet vezérlõvel!
(Status=0x%08lx)\n"
-}

Removed: trunk/reactos/base/applications/sm/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/ja-JP…
==============================================================================
--- trunk/reactos/base/applications/sm/ja-JP.rc (original)
+++ trunk/reactos/base/applications/sm/ja-JP.rc (removed)
@@ -1,55 +1,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- */
-
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
-{
-IDS_boot, "boot ƒTƒuƒVƒXƒeƒ€–¼" 
-
-IDS_help, "help [ƒRƒ}ƒ“ƒh]"
-
-IDS_info, "info [ƒTƒuƒVƒXƒeƒ€ID]"
-
-IDS_reboot, "reboot ƒTƒuƒVƒXƒeƒ€ID"
-
-IDS_shutdown,"shutdown ƒTƒuƒVƒXƒeƒ€ID"
-
-
-
-IDS_boot_msg, "”CˆÓ‚̊‹«ƒTƒuƒVƒXƒeƒ€‚ð‹N“®‚µ‚Ü‚·B"
-
-IDS_help_msg, "ƒRƒ}ƒ“ƒh‚̃wƒ‹ƒv‚ðo—Í‚µ‚Ü‚·B"
-
-IDS_info_msg,   "‹N“®‚µ‚Ä‚¢‚éƒTƒuƒVƒXƒeƒ€‚ɂ‚¢‚Ă̏î•ñ‚ðo—Í‚µ‚Ü‚·B\n\
-ƒTƒuƒVƒXƒeƒ€ID ‚ªÈ—ª‚³‚ꂽê‡‚́A‹N“®‚µ‚Ä‚¢‚é\n\
-ŠÂ‹«ƒTƒuƒVƒXƒeƒ€‚̈ꗗ‚ðo—Í‚µ‚Ü‚·B"
-
-IDS_reboot_msg,  "”CˆÓ‚̊‹«ƒTƒuƒVƒXƒeƒ€‚ðÄ‹N“®‚µ‚Ü‚·B"
-IDS_shutdown_msg, "”CˆÓ‚̊‹«ƒTƒuƒVƒXƒeƒ€‚ðI—¹‚µ‚Ü‚·B"
-
-IDS_Unknown, "–¢’m‚̃Rƒ}ƒ“ƒh '%s'.\n"
-
-IDS_SM1,  "SM ƒTƒuƒVƒXƒeƒ€ ƒfƒBƒŒƒNƒgƒŠ\n\n\
-SSID PID      ƒtƒ‰ƒbƒO\n\
----- -------- ------------\n"
-
-IDS_SM2, "%04x %08lx %04x\n"
-
-IDS_ID, "ƒTƒuƒVƒXƒeƒ€ ID: %d\n\
-     ƒtƒ‰ƒbƒO: %04x\n\
-  ƒvƒƒZƒX ID: %ld\n"
-
-IDS_Not_Imp,  "ŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ\n"
-
-IDS_Mangers, "ReactOS/Win32 - ƒZƒbƒVƒ‡ƒ“ ƒ}ƒl[ƒWƒƒ ƒRƒ“ƒgƒ[ƒ‹ ƒc[ƒ‹\n\n"
-
-IDS_USING, "Žg—p–@:\n\
-\tsm\n\
-\tsm help [ƒRƒ}ƒ“ƒh]\n\
-\tsm ƒRƒ}ƒ“ƒh [ˆø”]\n\n'sm help'
‚Æ“ü—Í‚·‚é‚ƁA—˜—p‰Â”\\‚ȃRƒ}ƒ“ƒh‚̈ꗗ‚ðo—Í‚µ‚Ü‚·B\n"
-
-IDS_FAILS_MNG, "ƒZƒbƒVƒ‡ƒ“ ƒ}ƒl[ƒWƒƒ‚Ƃ̐ڑ±‚ÉŽ¸”s‚µ‚Ü‚µ‚½!
(Status=0x%08lx)\n"
-}

Removed: trunk/reactos/base/applications/sm/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/nb-NO…
==============================================================================
--- trunk/reactos/base/applications/sm/nb-NO.rc (original)
+++ trunk/reactos/base/applications/sm/nb-NO.rc (removed)
@@ -1,55 +1,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- */
-
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-STRINGTABLE DISCARDABLE
-{
-IDS_boot, "oppstart subsystem_name" 
-
-IDS_help, "hjelp [kommando]"
-
-IDS_info, "informasjon [undersystem_id]"
-
-IDS_reboot, "restarter undersystem_id"
-
-IDS_shutdown,"avslutter undersystem_id"
-
-
-
-IDS_boot_msg, "bootstrap en valgfri miljø under-system;"
-
-IDS_help_msg, "skrive ut hjelp for kommando;"
-
-IDS_info_msg,   "skrive ut informasjon om en oppstart under-system\n\
-hvis subsystem_id er omitted, en liste av oppstart\n\
-miljø under-system er skrivet ut."
-
-IDS_reboot_msg,  "restart en valgfri miljø under-system;"
-IDS_shutdown_msg, "avslutt en valgfri miljø under-system;"
-
-IDS_Unknown, "Ukjent kommando '%s'.\n"
-
-IDS_SM1,  "SM SubSystem Directory\n\n\
-SSID PID      Flags\n\
----- -------- ------------\n"
-
-IDS_SM2, "%04x %08lx %04x\n"
-
-IDS_ID, "under-System ID: %d\n\
-       flagg: %04x\n\
-  Prosess ID: %ld\n"
-
-IDS_Not_Imp,  "ikke implementert\n"
-
-IDS_Mangers, "ReactOS/Win32 - Session Manager Control Tool\n\n"
-
-IDS_USING, "anvendelse:\n\
-\tsm\n\
-\tsm help [command]\n\
-\tsm command [arguments]\n\n'sm hjelp' vil trykke listen av gyldig
kommando.\n"
-
-IDS_FAILS_MNG, "Mislykket å koble til Session Manager! (Status=0x%08lx)\n"
-}

Added: trunk/reactos/base/applications/sm/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/rsrc.…
==============================================================================
--- trunk/reactos/base/applications/sm/rsrc.rc (added)
+++ trunk/reactos/base/applications/sm/rsrc.rc Tue Nov 28 23:19:18 2006
@@ -1,0 +1,11 @@
+#include <windows.h>
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#include "lang/en-US.rc"
+#include "lang/de-DE.rc"
+#include "lang/ja-JP.rc"
+#include "lang/hu-HU.rc"
+#include "lang/nb-NO.rc"
+#include "lang/ru-RU.rc"

Propchange: trunk/reactos/base/applications/sm/rsrc.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/base/applications/sm/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/ru-RU…
==============================================================================
--- trunk/reactos/base/applications/sm/ru-RU.rc (original)
+++ trunk/reactos/base/applications/sm/ru-RU.rc (removed)
@@ -1,51 +1,0 @@
-#include "resource.h"
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-{
-IDS_boot, "boot èìÿ_ïîäñèñòåìû" 
-
-IDS_help, "help [êîìàíäà]"
-
-IDS_info, "info [subsystem_id]"
-
-IDS_reboot, "reboot èäåíòèôèêàòîð_ïîäñèñòåìû"
-
-IDS_shutdown,"shutdown èäåíòèôèêàòîð_ïîäñèñòåìû"
-
-
-
-IDS_boot_msg, "çàãðóçêà äîïîëíèòåëüíîé ïîäñèñòåìû ñðåäû;"
-
-IDS_help_msg, "âûâîä ñïðàâêè äëÿ êîìàíäû;"
-
-IDS_info_msg,   "âûâîä èíôîðìàöèè î çàãðóæåííîé ïîäñèñòåìå\n\
-åñëè subsystem_id îïóùåí, òî ñïèñîê\n\
-çàãðóæåííûõ ïîäñèñòåì íå âûâîäèòñÿ."
-
-IDS_reboot_msg,  "ïåðåçàãðóçêà äîïîëíèòåëüíîé ïîäñèñòåìû ñðåäû;"
-IDS_shutdown_msg, "çàâåðøåíèå äîïîëíèòåëüíîé ïîäñèñòåìû ñðåäû;"
-
-IDS_Unknown, "Íåèçâåñòíàÿ êîìàíäà '%s'.\n"
-
-IDS_SM1,  "SM êàòàëîã ïîäñèñòåì\n\n\
-SSID PID      Ôëàãè\n\
----- -------- ------------\n"
-
-IDS_SM2, "%04x %08lx %04x\n"
-
-IDS_ID, "Ïîäñèñòåìà: %d\n\
-     Ôëàãè: %04x\n\
-   Ïðîöåññ: %ld\n"
-
-IDS_Not_Imp,  "íå ðåàëèçîâàíî\n"
-
-IDS_Mangers, "ReactOS/Win32 - Ìåíåäæåð óïðàâëåíèÿ ñåññèÿìè\n\n"
-
-IDS_USING, "Èñïîëüçîâàíèå:\n\
-\tsm\n\
-\tsm help [êîìàíäà]\n\
-\tsm command [àðãóìåíòû]\n\n'sm help' âûâîäèò ñïèñîê äîñòóïíûõ êîìàíä.\n"
-
-IDS_FAILS_MNG, "Îøèáêà ñîåäèíåíèÿ ñ Ìåíåäæåðîì Ñåññèé! (Ñòàòóñ=0x%08lx)\n"
-}

Modified: trunk/reactos/base/applications/sm/sm.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/sm.rc…
==============================================================================
--- trunk/reactos/base/applications/sm/sm.rc (original)
+++ trunk/reactos/base/applications/sm/sm.rc Tue Nov 28 23:19:18 2006
@@ -4,10 +4,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME	"sm.exe\0"
 #include <reactos/version.rc>
 
-#include "en-US.rc"
-#include "de-DE.rc"
-#include "ja-JP.rc"
-#include "hu-HU.rc"
-#include "nb-NO.rc"
-#include "ru-RU.rc"
+#include "rsrc.rc"
 
+