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

Author: janderwald
Date: Wed Nov 29 00:07:03 2006
New Revision: 24947

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

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

Removed: trunk/reactos/base/system/regsvr32/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/de-DE…
==============================================================================
--- trunk/reactos/base/system/regsvr32/de-DE.rc (original)
+++ trunk/reactos/base/system/regsvr32/de-DE.rc (removed)
@@ -1,33 +1,0 @@
-#include "resource.h"
-/*
- *  German language file by Klemens Friedl 2005-06-03
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-STRINGTABLE DISCARDABLE
-{
-
-IDS_UsageMessage, "%s\n\nSyntax: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]]
dllname\n\
-/u -	Serverregistrierung aufheben\n\
-/s -	Hintergrundmodus; Meldungen werden nicht angezeigt\n\
-/c -	Konsolen ausgabe\n\
-/i -	Aufruf von DLLInstall, wobei optional eine [Befehlszeile] übergeben\n\
-	werden kann. Unter Verwendung von /u wird die DLL_Deinstallation\n\
-	aufgerufen.\n\
-/n -	Kein Aufruf von DLLRegisterServer. Diese Option muss mit /i verwendet werden."
-
-IDS_NoDllSpecified,  "Es wurde kein DLL-Name angegeben."
-
-IDS_InvalidFlag,     "Ungültiger Parameter: %s"
-
-IDS_SwitchN_NoI,     "Ungültiger Parameter: /n muss zusammen mit dem /i Schalter
verwendet werden."
-
-IDS_DllNotLoaded,    "LoadLibrary('%s') ist fehlgeschlagen.\nGetLastError
Rückgabewert 0x%08x."
-
-IDS_MissingEntry,    "%s wurde geladen, aber der %s Einstiegspunkt wurde nicht
gefunden.\n\n\
-%s wurde möglicherweise nicht exportiert, oder eine fehlerhafte Version von %s befindet
sich im Speicher. Erwägen Sie die Verwendung von PView um es festzustellen und zu
löschen."
-
-IDS_FailureMessage,  "%s in %s ist fehlgeschlagen.\nRückgabewert: 0x%08x"
-
-IDS_SuccessMessage   "%s in %s war erfolgreich."
-}

Removed: trunk/reactos/base/system/regsvr32/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/en-US…
==============================================================================
--- trunk/reactos/base/system/regsvr32/en-US.rc (original)
+++ trunk/reactos/base/system/regsvr32/en-US.rc (removed)
@@ -1,32 +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_UsageMessage, "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]]
dllname\n\
-/u -	Unregister server\n\
-/s -	Silent; display no message boxes\n\
-/c -	Console output\n\
-/i -	Call DllInstall passing it an optional [cmdline]; when used with /u calls dll
uninstall\n\
-/n -	Do not call DllRegisterServer; this option must be used with /i"
-
-IDS_NoDllSpecified,  "No DLL name specified."
-
-IDS_InvalidFlag,     "Unrecognized flag: %s"
-
-IDS_SwitchN_NoI,     "Unrecognized flag: /n must be used with the /i switch"
-
-IDS_DllNotLoaded,    "LoadLibrary('%s') failed.\nGetLastError returns
0x%08x."
-
-IDS_MissingEntry,    "%s was loaded, but the %s entry point was not found.\n\n\
-%s may not be exported, or a corrupt version of %s may be in memory. Consider using PView
to detect and remove it."
-
-IDS_FailureMessage,  "%s in %s failed.\nReturn code was: 0x%08x"
-
-IDS_SuccessMessage   "%s in %s succeeded."
-}

Removed: trunk/reactos/base/system/regsvr32/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/fr-FR…
==============================================================================
--- trunk/reactos/base/system/regsvr32/fr-FR.rc (original)
+++ trunk/reactos/base/system/regsvr32/fr-FR.rc (removed)
@@ -1,35 +1,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- */
-/*
- * Translation made by Jerome Signouret, 2005.
- */
-
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-STRINGTABLE DISCARDABLE
-{
-
-IDS_UsageMessage, "%s\n\nUtilisation : regsvr32 [/u] [/s] [/c] [/n]
[/i[:lignedecommande]] nomDLL\n\
-/u -	Serveur non enregistré\n\
-/s -	Silence; ne pas afficher les messages\n\
-/c -	Sortie sur la console\n\
-/i -	Installe la DLL avec des options dans la [:lignedecommande]; si /u est présent, cela
provoque la désinstallation de la DLL\n\
-/n -	Ne pas faire d'appel au serveur d'enregistrement; cette option doit être
utilisé avec l'option /i"
-
-IDS_NoDllSpecified,  "Pas de DLL indiqué."
-
-IDS_InvalidFlag,     "Option non reconnue : %s"
-
-IDS_SwitchN_NoI,     "Option non reconnue : /n vous devez utiliser l'indicateur
/i."
-
-IDS_DllNotLoaded,    "LoadLibrary('%s') a échoué.\nGetLastError renvoie le
code 0x%08x."
-
-IDS_MissingEntry,    "%s est chargé mais le point d'entrée de %s n'a pas été
trouvé.\n\n \
-%s ne peut être exporté, ou une version corrompue de %s est en mémoire. Vous pouvez
utiliser Pview pour détecter la DLL et la supprimer."
-
-IDS_FailureMessage,  "%s dans %s a échoué.\nLe code d'erreur est : 0x%08x"
-
-IDS_SuccessMessage   "%s dans %s est un succès."
-}

Removed: trunk/reactos/base/system/regsvr32/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/hu-HU…
==============================================================================
--- trunk/reactos/base/system/regsvr32/hu-HU.rc (original)
+++ trunk/reactos/base/system/regsvr32/hu-HU.rc (removed)
@@ -1,33 +1,0 @@
-#include "resource.h"
-/*
- * Moved all hardcoded strings to En.rc.
- * By Magnus Olsen  2005 magnus(a)itkonsult-olsen.com
- * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com>
- */
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-{
-
-IDS_UsageMessage, "%s\n\nHasználat: regsvr32 [/u] [/s] [/c] [/n] [/i[:parancssor]]
dll_neve\n\
-/u -	Kiszolgáló regisztrációjának megszüntetése\n\
-/s -	Néma üzemmód, üzenetek megjelenítése nélkül\n\
-/c -	Parancssori kimenet\n\
-/i -	DllInstall meghívása a következõ [parancssor] átadásával; /u hívással használva a
dll eltávolítása\n\
-/n -	Ne hívja meg a DllRegisterServer függvényt; ezt a beállítást a /i kapcsolóval együtt
kell használni"
-
-IDS_NoDllSpecified,  "Nincs megadva DLL név."
-
-IDS_InvalidFlag,     "Meghatároztlan belépési pont: %s"
-
-IDS_SwitchN_NoI,     "Meghatározatlan belépési pont: /n csak az /i kapcsolóval
használható."
-
-IDS_DllNotLoaded,    "Hiba a LoadLibrary('%s') függvényben.\nA visszaadott
kód: 0x%08x."
-
-IDS_MissingEntry,    "A(z) %s betöltõdése megtörtént, de nem található a következõ
belépési pont: %s.\n\n\
-A(z) %s -t nem lehet hozzáadni, vagy a(z) %s egy érvénytelen változata van a memóriában.
Használja a PView-et hogy megkeresse és eltávolítsa azt."
-
-IDS_FailureMessage,  "A(z) %s sikertelen a következõben: %s.\nA visszaadott kód:
0x%08x"
-
-IDS_SuccessMessage   "A(z) %s sikerült a következõben: %s."
-}

Removed: trunk/reactos/base/system/regsvr32/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/ja-JP…
==============================================================================
--- trunk/reactos/base/system/regsvr32/ja-JP.rc (original)
+++ trunk/reactos/base/system/regsvr32/ja-JP.rc (removed)
@@ -1,32 +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_UsageMessage, "%s\n\nŽg—p–@: regsvr32 [/u] [/s] [/c] [/n] [/i[:ƒRƒ}ƒ“ƒh ƒ‰ƒCƒ“]]
DLL–¼\n\
-/u -	ƒT[ƒo[‚ð“o˜^‰ðœ‚·‚é\n\
-/s -	ƒTƒCƒŒƒ“ƒg; ƒƒbƒZ[ƒW ƒ{ƒbƒNƒX‚ð•\\Ž¦‚µ‚È‚¢\n\
-/c -	ƒRƒ“ƒ\\[ƒ‹o—Í\n\
-/i -	È—ª‰Â”\\‚È [ƒRƒ}ƒ“ƒh ƒ‰ƒCƒ“] ‚ðˆø”‚Æ‚µ‚Ä DllInstall ‚ðŒÄ‚яo‚·; /u
‚Æ•¹—p‚µ‚½ê‡‚Í dll uninstall ‚ðŒÄ‚яo‚·\n\
-/n -	DllRegisterServer ‚ðŒÄ‚яo‚³‚È‚¢; ‚±‚̃IƒvƒVƒ‡ƒ“‚Í /i ‚Æ•¹—p‚·‚é•K—v‚ª‚ ‚é"
-
-IDS_NoDllSpecified,  "DLL –¼‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñB"
-
-IDS_InvalidFlag,     "ƒtƒ‰ƒO‚ð”FŽ¯‚Å‚«‚Ü‚¹‚ñ: %s"
-
-IDS_SwitchN_NoI,     "ƒtƒ‰ƒO‚ð”FŽ¯‚Å‚«‚Ü‚¹‚ñ: /n ‚ðŽw’è‚·‚éê‡‚É‚Í /u
‚àŽw’肵‚È‚­‚Ä‚Í‚È‚è‚Ü‚¹‚ñB"
-
-IDS_DllNotLoaded,    "LoadLibrary('%s') ‚ÉŽ¸”s‚µ‚Ü‚µ‚½B\nGetLastError ‚Í
0x%08x ‚ð•Ô‚µ‚Ü‚µ‚½B"
-
-IDS_MissingEntry,    "%s ‚ð“ǂݍž‚Ý‚Ü‚µ‚½‚ªA%s ƒGƒ“ƒgƒŠ
ƒ|ƒCƒ“ƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n\n\
-%s ‚̓GƒNƒXƒ|[ƒg‚³‚ê‚Ä‚¢‚È‚¢‚©A%s
‚Ì•s³‚ȃo[ƒWƒ‡ƒ“‚ªƒƒ‚ƒŠã‚É‚ ‚é‰Â”\\«‚ª‚ ‚è‚Ü‚·BŒŸo‚âíœ‚ð‚·‚é‚½‚߁APView
‚ÌŽg—p‚ðŒŸ“¢‚µ‚Ä‚­‚¾‚³‚¢B"
-
-IDS_FailureMessage,  "%s (%s ‚Ì) ‚ÉŽ¸”s‚µ‚Ü‚µ‚½B\n•Ô‚Á‚Ä‚«‚½ƒR[ƒh: 0x%08x"
-
-IDS_SuccessMessage   "%s (%s ‚Ì) ‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B"
-}

Removed: trunk/reactos/base/system/regsvr32/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/nb-NO…
==============================================================================
--- trunk/reactos/base/system/regsvr32/nb-NO.rc (original)
+++ trunk/reactos/base/system/regsvr32/nb-NO.rc (removed)
@@ -1,32 +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_UsageMessage, "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdlinje]]
dllnavn\n\
-/u -	Uregistert server\n\
-/s -	Stille; vis ingen melding bokser\n\
-/c -	Konsoll utbytte\n\
-/i -	Kall DllInstall pasning det en valgfri [cmdlinje]; når brukt med /u kalles dll
avinstall\n\
-/n -	Ikke kall DllRegisterServer; denne mulighet må bli brukt med /i"
-
-IDS_NoDllSpecified,  "Ingen DLL navn spesifisert."
-
-IDS_InvalidFlag,     "ikke gjenkjent flagg: %s"
-
-IDS_SwitchN_NoI,     "ikke gjenkjent flagg: /n må bli brukt med  /i bryter"
-
-IDS_DllNotLoaded,    "LoadLibrary('%s') mislykket.\nGetLastError retur
0x%08x."
-
-IDS_MissingEntry,    "%s var lastet, men %s oppføring moment ble ikke funnet.\n\n\
-%s kan kanskje ikke bli eksportert, eller en forfalsket versjon av %s kan kanskje være i
minnet. Tenk å bruke PView for å oppspore og fjerne det."
-
-IDS_FailureMessage,  "%s inngående %s mislykket.\nretur kode ble: 0x%08x"
-
-IDS_SuccessMessage   "%s inngående %s lykkes."
-}

Modified: trunk/reactos/base/system/regsvr32/regsvr32.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv…
==============================================================================
--- trunk/reactos/base/system/regsvr32/regsvr32.rc (original)
+++ trunk/reactos/base/system/regsvr32/regsvr32.rc Wed Nov 29 00:07:03 2006
@@ -6,10 +6,4 @@
 #define REACTOS_STR_ORIGINAL_FILENAME	"regsvr32.exe\0"
 #include <reactos/version.rc>
 
-#include "de-DE.rc"
-#include "en-US.rc"
-#include "fr-FR.rc"
-#include "hu-HU.rc"
-#include "ru-RU.rc"
-#include "ja-JP.rc"
-#include "nb-NO.rc"
+#include "rsrc.rc"

Added: trunk/reactos/base/system/regsvr32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.…
==============================================================================
--- trunk/reactos/base/system/regsvr32/rsrc.rc (added)
+++ trunk/reactos/base/system/regsvr32/rsrc.rc Wed Nov 29 00:07:03 2006
@@ -1,0 +1,12 @@
+#include <windows.h>
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/ru-RU.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nb-NO.rc"

Propchange: trunk/reactos/base/system/regsvr32/rsrc.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/base/system/regsvr32/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/ru-RU…
==============================================================================
--- trunk/reactos/base/system/regsvr32/ru-RU.rc (original)
+++ trunk/reactos/base/system/regsvr32/ru-RU.rc (removed)
@@ -1,28 +1,0 @@
-#include "resource.h"
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
-{
-
-IDS_UsageMessage, "%s\n\nÈñïîëüçîâàíèå: regsvr32 [/u] [/s] [/c] [/n] [/i[:ïàðàìåòð]]
èìÿ_dll\n\
-/u - Îòìåíà ðåãèñòðàöèè ñåðâåðà\n\
-/s - Òèõèé;  íå îòîáðàæàòü îêîí ñîîáùåíèé\n\
-/c - Âûâîä â êîíñîëü\n\
-/i - Âûçûâàåò DllInstall ñ äîïîëíèòåëüíûì ïàðàìåòðîì [ïàðàìåòð]; Ïðè èñïîëüçîâàíèè êëþ÷à
/u âûçûâàåò DllUninstall\n\
-/n - Íå âûçûâàåò DllRegisterServer; ýòà îïöèÿ äîëæíà èñïîëüçîâàòüñÿ ñ /i"
-
-IDS_NoDllSpecified,  "Íå óêàçàíî èìÿ DLL."
-
-IDS_InvalidFlag,     "Íåèçâåñòíûé ïàðàìåòð: %s"
-
-IDS_SwitchN_NoI,     "Íåèçâåñòíûé ïàðàìåòð: /n äîëæåí èñïîëüçîâàòüñÿ ñîâìåñòíî ñ
ïàðàìåòðîì /i"
-
-IDS_DllNotLoaded,    "LoadLibrary('%s') çàâåðøèëñÿ íåóäà÷åé.\nGetLastError
âîçâðàùàåò 0x%08x."
-
-IDS_MissingEntry,    "%s áûë çàãðóæåí, íî òî÷êà âõîäà %s íå íàéäåíà.\n\n\
-%s ìîæåò áûòü íåýêñïîðòèðóåìîé èëè ïîâðåæäåííàÿ âåðñèÿ %s íàõîäèòñÿ â ïàìÿòè. Èñïîëüçóéòå
PView, ÷òîáû îáíàðóæèòü è óäàëèòü åãî."
-
-IDS_FailureMessage,  "%s â %s çàâåðøèëñÿ íåóäà÷åé.\nÂîçâðàùåííûé êîä: 0x%08x"
-
-IDS_SuccessMessage   "%s â %s óñïåøíî çàâåðøåíî."
-}