Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 24947: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

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\ngp@: regsvr32 [/u] [/s] [/c] [/n] [/i[:R}h C]] DLL¼\n\ -/u - T[o[ðo^ð·é\n\ -/s - TCg; bZ[W {bNXð\\¦µÈ¢\n\ -/c - R\\[oÍ\n\ -/i - ÈªÂ\\È [R}h C] ðøÆµÄ DllInstall ðÄÑo·; /u Æ¹pµ½êÍ dll uninstall ðÄÑo·\n\ -/n - DllRegisterServer ðÄÑo³È¢; ±ÌIvVÍ /i Æ¹p·éKvª é" - -IDS_NoDllSpecified, "DLL ¼ªwè³êÄ¢Ü¹ñB" - -IDS_InvalidFlag, "tOðF¯Å«Ü¹ñ: %s" - -IDS_SwitchN_NoI, "tOðF¯Å«Ü¹ñ: /n ðwè·éêÉÍ /u àwèµÈÄÍÈèÜ¹ñB" - -IDS_DllNotLoaded, "LoadLibrary('%s') É¸sµÜµ½B\nGetLastError Í 0x%08x ðÔµÜµ½B" - -IDS_MissingEntry, "%s ðÇÝÝÜµ½ªA%s Gg |Cgª©Â©èÜ¹ñÅµ½B\n\n\ -%s ÍGNX|[g³êÄ¢È¢©A%s Ìs³Èo[WªãÉ éÂ\\«ª èÜ·Boâíð·é½ßAPView Ìgpð¢µÄ¾³¢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 óñïåøíî çàâåðøåíî." -}

1 0

[janderwald] 24946: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 23:55:29 2006 New Revision: 24946 URL: http://svn.reactos.org/svn/reactos?rev=24946&view=rev Log: - shuffle resource files a bit Added: trunk/reactos/base/system/format/lang/ trunk/reactos/base/system/format/lang/de-DE.rc - copied unchanged from r24944, trunk/reactos/base/system/format/de-DE.rc trunk/reactos/base/system/format/lang/en-US.rc - copied unchanged from r24944, trunk/reactos/base/system/format/en-US.rc trunk/reactos/base/system/format/lang/fr-FR.rc - copied unchanged from r24944, trunk/reactos/base/system/format/fr-FR.rc trunk/reactos/base/system/format/lang/hu-HU.rc - copied unchanged from r24944, trunk/reactos/base/system/format/hu-HU.rc trunk/reactos/base/system/format/lang/ja-JP.rc - copied unchanged from r24944, trunk/reactos/base/system/format/ja-JP.rc trunk/reactos/base/system/format/lang/nb-NO.rc - copied unchanged from r24944, trunk/reactos/base/system/format/nb-NO.rc trunk/reactos/base/system/format/rsrc.rc (with props) Removed: trunk/reactos/base/system/format/de-DE.rc trunk/reactos/base/system/format/en-US.rc trunk/reactos/base/system/format/fr-FR.rc trunk/reactos/base/system/format/hu-HU.rc trunk/reactos/base/system/format/ja-JP.rc trunk/reactos/base/system/format/nb-NO.rc Modified: trunk/reactos/base/system/format/format.rc Removed: trunk/reactos/base/system/format/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/de-DE.r… ============================================================================== --- trunk/reactos/base/system/format/de-DE.rc (original) +++ trunk/reactos/base/system/format/de-DE.rc (removed) @@ -1,76 +1,0 @@ -#include "resource.h" - -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -STRINGTABLE DISCARDABLE -{ - - - - - - - - - -STRING_HELP, "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ - [Datenträger:] Legt das Laufwerk zum Formatieren fest.\n\ - -FS:file-system Legt das Dateisystem fest (%s).\n\ - -V:label Legt den Datentraegernamen fest.\n\ - -Q Fuehre Schnellformatierung durch.\n\ - -A:size Ueberschreibe Anweisung fuer Standartblockgroesse. Es wird dringend\n\ - empfohlen, grundsaetzlich Standarteinstellungen zu verwenden!\n\ - NTFS unterstuetzt 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT unterstuetzt 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS-Kompression wird fuer Blockgroessen ueber 4096 nicht\n\ - unterstuetzt.\n\ - -C Auf dem neuen Datentraeger erstellte Dateien werden\n\ - standartmaessig komprimiert.\n\n" - -STRING_COMPLETE "%lu Prozent komplett.\r" - -STRING_FORMAT_FAIL "FormatEx konnte Operation nich erfolgreich beenden.\n\n" - -STRING_NO_SUPPORT "Operation nicht unterstützt" - -STRING_FMIFS_FAIL "Kann FMIFS-Eingangspunkte nicht lokalisieren.\n\n" - -STRING_UNKNOW_ARG "Unbekanntes Argument: %S\n" - -STRING_DRIVE_PARM "Benötigter Laufwerkparameter fehlt.\n\n" - -STRING_ERROR_DRIVE_TYPE "Konnte den Laufwerkstyp nicht erhalten" - -STRING_INSERT_DISK "Legen Sie eine neue Diskette in Laufwerk %C: ein\nund drücken Sie Enter wenn das Laufwerk bereit ist" - -STRING_NO_VOLUME "Kann Medium nich abfragen" - -STRING_NO_VOLUME_SIZE "Kann Mediumsgröße nich abfragen" - -STRING_FILESYSTEM "Der Typ des Dateisystems ist %S.\n" - -STRING_LABEL_NAME_EDIT "Geben Sie die aktuelle Volumebezeichnung für Datenträger %C: ein" - -STRING_ERROR_LABEL "Eine unzulässige Volumebezeichnung wurde für diesen Datenträger eingegeben.\n" - -STRING_YN_FORMAT "\nACHTUNG, beim Formatieren werden ALLE Daten auf dem Datenträger %C: gelöscht!\nMit Formatierung fortfahren? (Ja/Nein)? " - -STRING_YES_NO_FAQ "J/N" - -STRING_VERIFYING "Prüfen" - -STRING_FAST_FMT "Schnellformatierung" - -STRING_CREATE_FSYS "Erzeuge Dateisystem Strukturen.\n" - -STRING_FMT_COMPLETE "Formatierung abgeschlossen.\n" - -STRING_VOL_COMPRESS "Medium unterstützt keine Kompression.\n" - -STRING_ENTER_LABEL "Volumebezeichnung (11 Zeichen, Enter für keine)? " - -STRING_NO_LABEL "Konnte Datenträger nicht benennen" - -STRING_FREE_SPACE "\n%I64d bytes Speicherkapazitaet.\n%I64d bytes freier Speicher.\n" - -STRING_SERIAL_NUMBER "\nVolume Seriennummer ist %04X-%04X\n" -} Removed: trunk/reactos/base/system/format/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/en-US.r… ============================================================================== --- trunk/reactos/base/system/format/en-US.rc (original) +++ trunk/reactos/base/system/format/en-US.rc (removed) @@ -1,72 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -STRINGTABLE DISCARDABLE -{ -STRING_HELP, "Usage: %S drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ - [drive:] Specifies the drive to format.\n\ - -FS:file-system Specifies the type of file system (%s).\n\ - -V:label Specifies volume label.\n\ - -Q Performs a quick format.\n\ - -A:size Overrides the default allocation unit size. Default settings\n\ - are strongly recommended for general use\n\ - NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS compression is not supported for allocation unit sizes\n\ - above 4096.\n\ - -C Files created on the new volume will be compressed by\n\ - default.\n\n" - -STRING_COMPLETE "%lu percent completed.\r" - -STRING_FORMAT_FAIL "FormatEx was unable to complete successfully.\n\n" - -STRING_NO_SUPPORT "Operation Not Supported" - -STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n" - -STRING_UNKNOW_ARG "Unknown argument: %S\n" - -STRING_DRIVE_PARM "Required drive parameter is missing.\n\n" - -STRING_ERROR_DRIVE_TYPE "Could not get drive type" - -STRING_INSERT_DISK "Insert a new floppy in drive %C:\nand press Enter when ready..." - -STRING_NO_VOLUME "Could not query volume" - -STRING_NO_VOLUME_SIZE "Could not query volume size" - -STRING_FILESYSTEM "The type of the file system is %S.\n" - -STRING_LABEL_NAME_EDIT "Enter current volume label for drive %C: " - -STRING_ERROR_LABEL "An incorrect volume label was entered for this drive.\n" - -STRING_YN_FORMAT "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\ -DRIVE %C: WILL BE LOST!\nProceed with Format (Y/N)? " - -STRING_YES_NO_FAQ "YN" - -STRING_VERIFYING "Verifying" - -STRING_FAST_FMT "QuickFormatting" - -STRING_CREATE_FSYS "Creating file system structures.\n" - -STRING_FMT_COMPLETE "Format complete.\n" - -STRING_VOL_COMPRESS "Volume does not support compression.\n" - -STRING_ENTER_LABEL "Volume Label (11 characters, Enter for none)? " - -STRING_NO_LABEL "Could not label volume" - -STRING_FREE_SPACE "\n%I64d bytes total disk space.\n%I64d bytes available on disk.\n" - -STRING_SERIAL_NUMBER "\nVolume Serial Number is %04X-%04X\n" -} Modified: trunk/reactos/base/system/format/format.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.rc (original) +++ trunk/reactos/base/system/format/format.rc Tue Nov 28 23:55:29 2006 @@ -4,8 +4,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "format.exe\0" #include <reactos/version.rc> -#include "en-US.rc" -#include "de-DE.rc" -#include "fr-FR.rc" -#include "hu-HU.rc" -#include "nb-NO.rc" +#include "rsrc.rc" Removed: trunk/reactos/base/system/format/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/fr-FR.r… ============================================================================== --- trunk/reactos/base/system/format/fr-FR.rc (original) +++ trunk/reactos/base/system/format/fr-FR.rc (removed) @@ -1,73 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ -/* - * Translation made by Jerome Signouret, 2005. - */ - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH - -STRINGTABLE DISCARDABLE -{ -STRING_HELP, "Utilisation : %S disque: [-FS:système de fichier] [-V:nom] [-Q] [-A:taille] [-C]\n\n\ - [disque:] Indique le disque à formater.\n\ - -FS:système de fichier Indique le type de système de fichier (%s).\n\ - -V:nom Détermine le nom du disque.\n\ - -Q Effectue un formatage rapide.\n\ - -A:taille Force une taille pour les unités d'allocations. Les valeurs par défaut\n\ - sont fortement recommandées pour une utilisation courante\n\ - NTFS peut utiliser 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT peut utiliser 8192, 16K, 32K, 64K, 128K, 256K.\n\ - La compression NTFS n'est pas possible au de là de 4096.\n\ - -C Les fichiers sur le nouveau disque seront compressés automatiquement." - -STRING_COMPLETE "%lu pourcent effectués.\r" - -STRING_FORMAT_FAIL "FormatEx ne peut se finir avec succés.\n\n" - -STRING_NO_SUPPORT "Fontion Non Supportée" - -STRING_FMIFS_FAIL "Impossible de trouver les points d'entrée FMIFS.\n\n" - -STRING_UNKNOW_ARG "Argument inconnu : %S\n" - -STRING_DRIVE_PARM "Le disque à formater n'est pas indiqué.\n\n" - -STRING_ERROR_DRIVE_TYPE "Impossible d'obtenir le type de disque" - -STRING_INSERT_DISK "Mettre une nouvelle disquette dans le lecteur %C:\n et appuyer sur Entrée..." - -STRING_NO_VOLUME "Impossible de trouver le disque" - -STRING_NO_VOLUME_SIZE "Impossible de déterminer la taille du disque" - -STRING_FILESYSTEM "Le type de système de fichier est %S.\n" - -STRING_LABEL_NAME_EDIT "Donner un nom pour le disque %C : " - -STRING_ERROR_LABEL "Le nom pour le disque n'est pas correct.\n" - -STRING_YN_FORMAT "\nATTENTION, TOUTES LES DONNÉES SUR LE DISQUE %C: SERONT\n\PERDUES !\nContinuer avec le formatage ? (O/N) ?" - -STRING_YES_NO_FAQ "ON" - -STRING_VERIFYING "Vérifications" - -STRING_FAST_FMT "Formatage rapide" - -STRING_CREATE_FSYS "Création des structures du système de fichier.\n" - -STRING_FMT_COMPLETE "Formatage terminé.\n" - -STRING_VOL_COMPRESS "Le disque ne supporte pas la compression.\n" - -STRING_ENTER_LABEL "Nom du disque (11 caractères, Entrée si aucun)? " - -STRING_NO_LABEL "Impossible de donner un nom au disque" - -STRING_FREE_SPACE "\nEspace disque total : %I64d octet.\n Espace disque disponible : %I64d octet.\n" - -STRING_SERIAL_NUMBER "\nNuméro de série du disque: %04X-%04X\n" -} Removed: trunk/reactos/base/system/format/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/hu-HU.r… ============================================================================== --- trunk/reactos/base/system/format/hu-HU.rc (original) +++ trunk/reactos/base/system/format/hu-HU.rc (removed) @@ -1,76 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com> - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ -STRING_HELP, "Használat: %S kötet: [-FS:állományrendszer] [-V:címke] [-Q] [-A:méret] [-C]\n\n\ - [kötet:] A meghajtóbetûjelet adja meg (kettõsponttal a végén).\n\ - -FS:állományrendszer Az állományrendszer típusát adja meg (%s).\n\ - -V:címke A Kötetcímke neve.\n\ - -Q Gyorsformázást hajt végre.\n\ - -A:méret Felülbírálja az alapértelmezett szektorcsoport-\n\ - méretet. Általános használathoz az alapértelmezett\n\ - értékek ajánlottak.\n\ - Az NTFS a következõ értékeket támogatja: 512, 1024, 2048,\n\ - 4096, 8192, 16K, 32K, 64K.\n\ - A FAT a következõ értékeket támogatja: 8192, 16K, 32K, 64K,\n\ - 128K, 256K.\n\ - NTFS-tömörítés nem lehetséges 4096 bájtnál nagyobb\n\ - szektorcsoportoknál.\n\ - -C Az új köteten létrehozott állományok alapból tömörítve jönnek\n\ - létre.\n\n" - -STRING_COMPLETE "%lu százalék befejezve.\r" - -STRING_FORMAT_FAIL "A FormatEx végrehajtása sikertelenül fejezõdött be.\n\n" - -STRING_NO_SUPPORT "A Mûvelet Nem Támogatott" - -STRING_FMIFS_FAIL "Nem találtam meg az FMIFS kezdõpontját.\n\n" - -STRING_UNKNOW_ARG "Érvénytelen paraméter: %S\n" - -STRING_DRIVE_PARM "Hiányzik a meghajtó meghatározás.\n\n" - -STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát" - -STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\Ha készen áll, nyomja meg az ENTER billenytût..." - -STRING_NO_VOLUME "Nem sikerült megállapítani címkét" - -STRING_NO_VOLUME_SIZE "Nem sikerült megállapítani a kötet méretét" - -STRING_FILESYSTEM "A állományrendszer típusa %S.\n" - -STRING_LABEL_NAME_EDIT "Adja meg a címkét az alábbi meghajtóhoz: %C: " - -STRING_ERROR_LABEL "Érvénytelen címkét adott meg a meghajtóhoz.\n" - -STRING_YN_FORMAT "\nFIGYELMEZTETÉS: A NEM CSERÉLHETÕ LEMEZMEGHAJTÓN (%C:) MINDEN ADAT EL FOG VESZNI.\n\ - \nFolytatja a formázást? (I/N)? " - -STRING_YES_NO_FAQ "IN" - -STRING_VERIFYING "Ellenõrzés" - -STRING_FAST_FMT "Gyorsformázás" - -STRING_CREATE_FSYS "Állományrendszer létrehozása.\n" - -STRING_FMT_COMPLETE "Formázás befejezve.\n" - -STRING_VOL_COMPRESS "A Kötet nem támogatja a tömörítést.\n" - -STRING_ENTER_LABEL "Kötetcímke (legfeljebb 11 karakter, ENTER ha nincs)? " - -STRING_NO_LABEL "A kötet nem kapott címkét" - -STRING_FREE_SPACE "\n%I64d bájt teljes lemezterület.\n%I64d bájt elérhetõ a köteten.\n" - -STRING_SERIAL_NUMBER "\nA Kötet sorozatszáma: %04X-%04X\n" -} Removed: trunk/reactos/base/system/format/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/ja-JP.r… ============================================================================== --- trunk/reactos/base/system/format/ja-JP.rc (original) +++ trunk/reactos/base/system/format/ja-JP.rc (removed) @@ -1,75 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE -{ -STRING_HELP, "gp@: %S hCu: [-FS:t@CVXe] [-V:x] [-Q] [-A:TCY] [-C]\n\n\ - [hCu:] tH[}bg·éhCuðwèµÜ·B\n\ - -FS:t@CVXe\n\ - t@CVXeÌíÞðwèµÜ· (%s)B\n\ - -V:x {[ xðwèµÜ·B\n\ - -Q NCbN tH[}bgðÀsµÜ·B\n\ - -A:TCY KèÌAP[V jbg TCYðã«µÜ·B\n\ - êÊIÉÍKèÌÝèðp¢é±Æð§µÜ·B\n\ - NTFS Í 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K ð\n\ - T|[gµÜ·B\n\ - FAT Í 8192, 16K, 32K, 64K, 128K, 256K ð\n\ - T|[gµÜ·B - NTFS ³kÍ 4096 æèàå«¢AP[V jbg\n\ - TCYÉÍÎµÄ¢Ü¹ñB - -C ftHgÅVµ¢{[Éì¬³ê½t@Cð\n\ - ³kµÜ·B\n\n" - -STRING_COMPLETE "%lu % ®¹B\r" - -STRING_FORMAT_FAIL "FormatEx Í³íÉI¹Å«Ü¹ñÅµ½B\n\n" - -STRING_NO_SUPPORT "ªT|[g³êÄ¢Ü¹ñB" - -STRING_FMIFS_FAIL "FMIFS Gg |Cg ðÝèÅ«Ü¹ñÅµ½B\n\n" - -STRING_UNKNOW_ARG "s¾Èø: %S\n" - -STRING_DRIVE_PARM "KvÈhCuðwè·ép[^ªs«µÄ¢Ü·B\n\n" - -STRING_ERROR_DRIVE_TYPE "hCuÌíÞªí©èÜ¹ñÅµ½" - -STRING_INSERT_DISK "%C: hCuÉVµ¢tbs[ð}üµÄ¾³¢B\nõªÅ«½çA[Enter] L[ðµÄ¾³¢..." - -STRING_NO_VOLUME "{[Ìâ¢í¹ªÅ«Ü¹ñÅµ½" - -STRING_NO_VOLUME_SIZE "{[ TCYÌâ¢í¹ªÅ«Ü¹ñÅµ½" - -STRING_FILESYSTEM "t@CVXeÌ^CvÍ %S Å·B\n" - -STRING_LABEL_NAME_EDIT "hCu D: Ì»ÝÌ{[ xðüÍµÄ¾³¢ " - -STRING_ERROR_LABEL "±ÌhCuÉÎµÄA³øÈ{[ xªüÍ³êÜµ½B\n" - -STRING_YN_FORMAT "\nx!! ÅèfBXNÌ %C: hCuÌSÄÌf[^ª\n\ -¸íêÜ·! \ntH[}bgðJnµÜ·© (Y/N)? " - -STRING_YES_NO_FAQ "YN" - -STRING_VERIFYING "xt@CµÄ¢Ü·" - -STRING_FAST_FMT "NCbNtH[}bgµÄ¢Ü·" - -STRING_CREATE_FSYS "t@CVXeð\\¬µÄ¢Ü·B\n" - -STRING_FMT_COMPLETE "tH[}bgª®¹µÜµ½B\n" - -STRING_VOL_COMPRESS "{[Í³kðT|[gµÄ¢Ü¹ñB\n" - -STRING_ENTER_LABEL "{[ x (11 ¶AÝèµÈ¢êÍ [Enter] L[)? " - -STRING_NO_LABEL "{[ÉxðÂ¯çêÜ¹ñÅµ½B" - -STRING_FREE_SPACE "\nfBXNÌæÍvÅ %I64d oCgÅ·B\n»Ì¤¿ %I64d oCgªgpÂ\\Å·B\n" - -STRING_SERIAL_NUMBER "\n{[ VAÔÍ %04X-%04X Å·\n" -} Removed: trunk/reactos/base/system/format/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/nb-NO.r… ============================================================================== --- trunk/reactos/base/system/format/nb-NO.rc (original) +++ trunk/reactos/base/system/format/nb-NO.rc (removed) @@ -1,72 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -STRINGTABLE DISCARDABLE -{ -STRING_HELP, "bruk: %S stasjon: [-FS:fil-system] [-V:merke] [-Q] [-A:størrelse] [-C]\n\n\ - [stasjon:] Spesifisere stasjon til formater.\n\ - -FS:file-system Spesifisere typen av fil system (%s).\n\ - -V:merke Spesifisere volum merke.\n\ - -Q Fullføre en rask formatering.\n\ - -A:størrelse Dominerende standard fordeling enhet størrelse. Standard innstilling\n\ - er sterkt anbefalt for generielt bruk\n\ - NTFS støtter 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT støtter 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS komprimering er ikke støttet for fordeling enhet størrelse\n\ - ovenfor 4096.\n\ - -C Filer opprettet på nytt volum vil bli komprimert etter\n\ - standard.\n\n" - -STRING_COMPLETE "%lu prosent ferdig.\r" - -STRING_FORMAT_FAIL "FormatEx var ikke i stand til fullstendig vellykket.\n\n" - -STRING_NO_SUPPORT "Operasjon ikke støttet" - -STRING_FMIFS_FAIL "Kunne ikke befinne seg FMIFS artikkel momenter.\n\n" - -STRING_UNKNOW_ARG "Ukjent argument: %S\n" - -STRING_DRIVE_PARM "Obligatorisk drive parameter er mistet.\n\n" - -STRING_ERROR_DRIVE_TYPE "Kunne ikke få drive typen" - -STRING_INSERT_DISK "Sett inn en ny diskett i stasjon %C:\nog trykk på Enter når du er klar..." - -STRING_NO_VOLUME "Kunne ikke spørre om volumet" - -STRING_NO_VOLUME_SIZE "Kunne ikke spørre om volumet størrelse" - -STRING_FILESYSTEM "Typen av filsystem er %S.\n" - -STRING_LABEL_NAME_EDIT "Velg aktuell volum merke for stasjon %C: " - -STRING_ERROR_LABEL "Et uriktig volum merke ble innskrivet for denne stasjonen.\n" - -STRING_YN_FORMAT "\nADVARSEL, ALLE DATA PÅ EN DISK SOM IKKE KAN FJERNES \n\ -STASJON %C: VIL BLI BORTE!\nFortsette med Formateringen (J/N)? " - -STRING_YES_NO_FAQ "JN" - -STRING_VERIFYING "kontrollerer" - -STRING_FAST_FMT "Rask Formatering" - -STRING_CREATE_FSYS "Opprett filsystem struktur.\n" - -STRING_FMT_COMPLETE "Formateringen fullført.\n" - -STRING_VOL_COMPRESS "Volumet støtter ikke komprimering.\n" - -STRING_ENTER_LABEL "Volum merke (11 tegn, legge inn for ingen)? " - -STRING_NO_LABEL "Kunne ikke merke volumet" - -STRING_FREE_SPACE "\n%I64d byte total ledig plass.\n%I64d byte tilgjengelig på disken.\n" - -STRING_SERIAL_NUMBER "\nVolumet Serie nummer er %04X-%04X\n" -} Added: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc (added) +++ trunk/reactos/base/system/format/rsrc.rc Tue Nov 28 23:55:29 2006 @@ -1,0 +1,10 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/en-US.rc" +#include "lang/de-DE.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/nb-NO.rc" Propchange: trunk/reactos/base/system/format/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 24945: fixing a bug in Create_DirectDraw, did call on Main_DirectDraw_Initialize, but that function have been rewriten, and did not working as the old one.
by greatlrd＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: greatlrd Date: Tue Nov 28 23:52:22 2006 New Revision: 24945 URL: http://svn.reactos.org/svn/reactos?rev=24945&view=rev Log: fixing a bug in Create_DirectDraw, did call on Main_DirectDraw_Initialize, but that function have been rewriten, and did not working as the old one. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue Nov 28 23:52:22 2006 @@ -531,7 +531,7 @@ if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID) == DD_OK); { - return ((LPDIRECTDRAW7)This)->lpVtbl->Initialize ((LPDIRECTDRAW7)This, pGUID); + return DD_OK; } return DDERR_INVALIDPARAMS;

1 0

[janderwald] 24944: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 23:48:52 2006 New Revision: 24944 URL: http://svn.reactos.org/svn/reactos?rev=24944&view=rev Log: - shuffle resource files a bit Added: trunk/reactos/base/system/expand/lang/ trunk/reactos/base/system/expand/lang/de-DE.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/de-DE.rc trunk/reactos/base/system/expand/lang/el-GR.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/el-GR.rc trunk/reactos/base/system/expand/lang/en-US.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/en-US.rc trunk/reactos/base/system/expand/lang/fr-FR.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/fr-FR.rc trunk/reactos/base/system/expand/lang/hu-HU.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/hu-HU.rc trunk/reactos/base/system/expand/lang/ja-JP.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/ja-JP.rc trunk/reactos/base/system/expand/lang/nb-NO.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/nb-NO.rc trunk/reactos/base/system/expand/lang/ru-RU.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/ru-RU.rc trunk/reactos/base/system/expand/lang/sv-SE.rc - copied unchanged from r24943, trunk/reactos/base/system/expand/sv-SE.rc trunk/reactos/base/system/expand/rsrc.rc (with props) Removed: trunk/reactos/base/system/expand/de-DE.rc trunk/reactos/base/system/expand/el-GR.rc trunk/reactos/base/system/expand/en-US.rc trunk/reactos/base/system/expand/fr-FR.rc trunk/reactos/base/system/expand/hu-HU.rc trunk/reactos/base/system/expand/ja-JP.rc trunk/reactos/base/system/expand/nb-NO.rc trunk/reactos/base/system/expand/ru-RU.rc trunk/reactos/base/system/expand/sv-SE.rc Modified: trunk/reactos/base/system/expand/expand.rc Removed: trunk/reactos/base/system/expand/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/de-DE.r… ============================================================================== --- trunk/reactos/base/system/expand/de-DE.rc (original) +++ trunk/reactos/base/system/expand/de-DE.rc (removed) @@ -1,16 +1,0 @@ -#include "resource.h" -/* - * Translated into German. - * By Rouven Wessling 2005 pentiumforever(a)gmail.com - */ - -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -STRINGTABLE DISCARDABLE -{ - -IDS_Copy, "ReactOS Dateiexpansionsprogramm Version 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -Verwendung: %s infile [outfile]\n" - -IDS_FAILS "LZCopy fehlgeschlagen: Rückgabe ist %ld\n" -} Removed: trunk/reactos/base/system/expand/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/el-GR.r… ============================================================================== --- trunk/reactos/base/system/expand/el-GR.rc (original) +++ trunk/reactos/base/system/expand/el-GR.rc (removed) @@ -1,18 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - * GR.rc by Dj Apal® - * - */ - -LANGUAGE LANG_GREEK, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ - -IDS_Copy, "ReactOS Expansion Utility Version 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -×ñÞóç: %s infile [outfile]\n" - -IDS_FAILS "LZÁíôéãñáöÞ áðÝôõ÷å: åðéóôñÜöçêå %ld\n" -} Removed: trunk/reactos/base/system/expand/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/en-US.r… ============================================================================== --- trunk/reactos/base/system/expand/en-US.rc (original) +++ trunk/reactos/base/system/expand/en-US.rc (removed) @@ -1,16 +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_Copy, "ReactOS File Expansion Utility Version 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -Usage: %s infile [outfile]\n" - -IDS_FAILS "LZCopy failed: return is %ld\n" -} Modified: trunk/reactos/base/system/expand/expand.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.… ============================================================================== --- trunk/reactos/base/system/expand/expand.rc (original) +++ trunk/reactos/base/system/expand/expand.rc Tue Nov 28 23:48:52 2006 @@ -4,13 +4,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "expand.exe\0" #include <reactos/version.rc> -#include "en-US.rc" -#include "de-DE.rc" -#include "fr-FR.rc" -#include "ja-JP.rc" -#include "ru-RU.rc" -#include "sv-SE.rc" -#include "hu-HU.rc" -#include "el-GR.rc" -#include "nb-NO.rc" - +#include "rsrc.rc" Removed: trunk/reactos/base/system/expand/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/fr-FR.r… ============================================================================== --- trunk/reactos/base/system/expand/fr-FR.rc (original) +++ trunk/reactos/base/system/expand/fr-FR.rc (removed) @@ -1,16 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -STRINGTABLE DISCARDABLE -{ - -IDS_Copy, "ReactOS Utilitaire de décompression de fichiers Version 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -Utilisation : %s FichierEntrée [fichierdesortie]\n" - -IDS_FAILS "LZCopy a echoué : code d'erreur retourné : %ld\n" -} Removed: trunk/reactos/base/system/expand/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/hu-HU.r… ============================================================================== --- trunk/reactos/base/system/expand/hu-HU.rc (original) +++ trunk/reactos/base/system/expand/hu-HU.rc (removed) @@ -1,17 +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_Copy, "ReactOS Fájlkicsomagoló segédprogram 1.0 verzió\n\ -Szerzõi jog: Victor Schneider 1997\n\n\ -Használat: %s forrás [cél]\n" - -IDS_FAILS "LZCopy sikertelen, visszatérése: %ld\n" -} Removed: trunk/reactos/base/system/expand/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/ja-JP.r… ============================================================================== --- trunk/reactos/base/system/expand/ja-JP.rc (original) +++ trunk/reactos/base/system/expand/ja-JP.rc (removed) @@ -1,16 +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_Copy, "ReactOS File Expansion Utility Version 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -gp@: %s WJ³t@C [WJæt@C]\n" - -IDS_FAILS "LZCopy É¸sµÜµ½: ÔèlÍ %ld Å·B\n" -} Removed: trunk/reactos/base/system/expand/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/nb-NO.r… ============================================================================== --- trunk/reactos/base/system/expand/nb-NO.rc (original) +++ trunk/reactos/base/system/expand/nb-NO.rc (removed) @@ -1,16 +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_Copy, "ReactOS Fil ekstrakterings Verktøy Versjon 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -Bruk: %s innfil [utfil]\n" - -IDS_FAILS "LZCopy mislykket: retur ble %ld\n" -} Added: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/expand/rsrc.rc (added) +++ trunk/reactos/base/system/expand/rsrc.rc Tue Nov 28 23:48:52 2006 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" +#include "lang/ru-RU.rc" +#include "lang/sv-SE.rc" Propchange: trunk/reactos/base/system/expand/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/base/system/expand/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/ru-RU.r… ============================================================================== --- trunk/reactos/base/system/expand/ru-RU.rc (original) +++ trunk/reactos/base/system/expand/ru-RU.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" - -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ - -IDS_Copy, "Óòèëèòà ðàñïàêîâêè ôàéëîâ ReactOS, âåðñèÿ 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -Èñïîëüçîâàíèå: %s èñõîäíûé_ôàéë [âûõîäíîé_ôàéë]\n" - -IDS_FAILS "Íå óäàëîñü âûïîëíèòü LZCopy, âîçâðàùåíî: %ld\n" -} Removed: trunk/reactos/base/system/expand/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/sv-SE.r… ============================================================================== --- trunk/reactos/base/system/expand/sv-SE.rc (original) +++ trunk/reactos/base/system/expand/sv-SE.rc (removed) @@ -1,15 +1,0 @@ -#include "resource.h" -/* - * Copyright 2005 David Nordenberg - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH -STRINGTABLE DISCARDABLE -{ - -IDS_Copy, "ReactOS verktyg för filextrahering version 1.0\n\ -Copyright Victor Schneider 1997\n\n\ -Användning: %s källfil [målfil]\n" - -IDS_FAILS "LZCopy misslyckades, felkod: %ld\n" -}

1 0

[janderwald] 24943: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 23:39:07 2006 New Revision: 24943 URL: http://svn.reactos.org/svn/reactos?rev=24943&view=rev Log: - shuffle resource files a bit Added: trunk/reactos/base/applications/taskmgr/lang/ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/nb-NO.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/nb-NO.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc - copied unchanged from r24942, trunk/reactos/base/applications/taskmgr/uk-UA.rc Removed: trunk/reactos/base/applications/taskmgr/cs-CZ.rc trunk/reactos/base/applications/taskmgr/da-DK.rc trunk/reactos/base/applications/taskmgr/de-DE.rc trunk/reactos/base/applications/taskmgr/en-US.rc trunk/reactos/base/applications/taskmgr/es-ES.rc trunk/reactos/base/applications/taskmgr/fr-FR.rc trunk/reactos/base/applications/taskmgr/hu-HU.rc trunk/reactos/base/applications/taskmgr/ja-JP.rc trunk/reactos/base/applications/taskmgr/nb-NO.rc trunk/reactos/base/applications/taskmgr/nl-NL.rc trunk/reactos/base/applications/taskmgr/sv-SE.rc trunk/reactos/base/applications/taskmgr/uk-UA.rc Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/applications/taskmgr/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/applications/taskmgr/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…

1 0

[janderwald] 24942: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 23:26:23 2006 New Revision: 24942 URL: http://svn.reactos.org/svn/reactos?rev=24942&view=rev Log: - shuffle resource files a bit Added: trunk/reactos/base/applications/sndvol32/lang/ trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/cs-CZ.rc trunk/reactos/base/applications/sndvol32/lang/de-DE.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/de-DE.rc trunk/reactos/base/applications/sndvol32/lang/en-US.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/en-US.rc trunk/reactos/base/applications/sndvol32/lang/fr-FR.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/fr-FR.rc trunk/reactos/base/applications/sndvol32/lang/hu-HU.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/hu-HU.rc trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/ja-JP.rc trunk/reactos/base/applications/sndvol32/lang/nl-NL.rc - copied unchanged from r24940, trunk/reactos/base/applications/sndvol32/nl-NL.rc trunk/reactos/base/applications/sndvol32/lang/sv-SE.rc - copied unchanged from r24941, trunk/reactos/base/applications/sndvol32/sv-SE.rc trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc - copied unchanged from r24941, trunk/reactos/base/applications/sndvol32/uk-UA.rc Removed: trunk/reactos/base/applications/sndvol32/cs-CZ.rc trunk/reactos/base/applications/sndvol32/de-DE.rc trunk/reactos/base/applications/sndvol32/en-US.rc trunk/reactos/base/applications/sndvol32/fr-FR.rc trunk/reactos/base/applications/sndvol32/hu-HU.rc trunk/reactos/base/applications/sndvol32/ja-JP.rc trunk/reactos/base/applications/sndvol32/nl-NL.rc trunk/reactos/base/applications/sndvol32/sv-SE.rc trunk/reactos/base/applications/sndvol32/uk-UA.rc Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rc Removed: trunk/reactos/base/applications/sndvol32/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/cs-CZ.rc (original) +++ trunk/reactos/base/applications/sndvol32/cs-CZ.rc (removed) @@ -1,43 +1,0 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Nastavení" - BEGIN - MENUITEM "&Monosti", IDC_PROPERTIES - MENUITEM "&Rozíøené nastevení", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Konec", IDC_EXIT - END - POPUP "&Pomoc" - BEGIN - MENUITEM "&Témata nápovìdy", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&O ovládání hlasitosti ...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Ovládání hlasitosti" - IDS_NOMIXERDEVICES "Nejsou dostupné ádné smìovací zaøízení! Aplikace se nyní ukonèí." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Monosti" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Smìovací zaøízení:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Upravit hlasitost pro:", -1, 7,25,211,77 - PUSHBUTTON "&Pøehrávání", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Záznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Jiné:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Zruit", IDCANCEL, 168,226,50,14 -END Removed: trunk/reactos/base/applications/sndvol32/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/de-DE.rc (original) +++ trunk/reactos/base/applications/sndvol32/de-DE.rc (removed) @@ -1,43 +1,0 @@ -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Optionen" - BEGIN - MENUITEM "&Eigenschaften", IDC_PROPERTIES - MENUITEM "Erweiterte Ein&stellungen", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Beenden", IDC_EXIT - END - POPUP "&?" - BEGIN - MENUITEM "&Hilfethemen", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Info", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Lautstärke Einstellungen" - IDS_NOMIXERDEVICES "Es sind keine aktiven Mixer vorhanden! Die Anwendung wird jetzt beendet." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Eigenschaften" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Mixer:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Lautstärke regeln für:", -1, 7,25,211,77 - PUSHBUTTON "Wie&dergabe", IDC_PLAYBACK, 13,43,50,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,50,8, BS_AUTORADIOBUTTON - PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 -END Removed: trunk/reactos/base/applications/sndvol32/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/en-US.rc (original) +++ trunk/reactos/base/applications/sndvol32/en-US.rc (removed) @@ -1,43 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "O&ptions" - BEGIN - MENUITEM "P&roperties", IDC_PROPERTIES - MENUITEM "&Advanced Controls", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "E&xit", IDC_EXIT - END - POPUP "&Help" - BEGIN - MENUITEM "&Help Topics", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&About Volume Control", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Volume Control" - IDS_NOMIXERDEVICES "There are no active mixer devices available! The application will now exit." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Mixer device:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Adjust volume for:", -1, 7,25,211,77 - PUSHBUTTON "&Playback", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Recording", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Other:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Cancel", IDCANCEL, 168,226,50,14 -END Removed: trunk/reactos/base/applications/sndvol32/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/fr-FR.rc (original) +++ trunk/reactos/base/applications/sndvol32/fr-FR.rc (removed) @@ -1,44 +1,0 @@ -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "O&ptions" - BEGIN - MENUITEM "P&ropriétés", IDC_PROPERTIES - MENUITEM "&Contrôles avancés", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "Q&uitter", IDC_EXIT - END - POPUP "&?" - BEGIN - MENUITEM "&Aide", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "A &propos ...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Contrôle du volume" - IDS_NOMIXERDEVICES "Il n'y a pas de périphérique de mixage disponible ! L'application va se terminer." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Propriétés" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Périphérique de mixage :", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Ajuster le volume pour :", -1, 7,25,211,77 - PUSHBUTTON "&Lecture", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Enregistrement", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Autre :", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14 -END - Removed: trunk/reactos/base/applications/sndvol32/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/hu-HU.rc (original) +++ trunk/reactos/base/applications/sndvol32/hu-HU.rc (removed) @@ -1,45 +1,0 @@ -/* - * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu -*/ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Beállítások" - BEGIN - MENUITEM "&Tulajdonságok", IDC_PROPERTIES - MENUITEM "&Részletes beállítások", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Kilépés", IDC_EXIT - END - POPUP "&Súgó" - BEGIN - MENUITEM "Súgó &témák", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Névjegy ...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Hangerõ szabályozó" - IDS_NOMIXERDEVICES "Nincsenek elérhetõ keverõ eszközök. A program kilép." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Tulajdonságok" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Keverõ eszköz:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Hangerõ szabályozás:", -1, 7,25,211,77 - PUSHBUTTON "&Lejátszás", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Felvétel", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Egyéb:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Mégse", IDCANCEL, 168,226,50,14 -END Removed: trunk/reactos/base/applications/sndvol32/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/ja-JP.rc (original) +++ trunk/reactos/base/applications/sndvol32/ja-JP.rc (removed) @@ -1,43 +1,0 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "IvV(&P)" - BEGIN - MENUITEM "vpeB(&R)", IDC_PROPERTIES - MENUITEM "g[²®(&A)", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "{[ Rg[ÌI¹(&X)", IDC_EXIT - END - POPUP "wv(&H)" - BEGIN - MENUITEM "gsbNÌõ(&H)", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "o[Wîñ(&A)...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "{[ Rg[" - IDS_NOMIXERDEVICES "ANeBuÈ~LT[ªpÅ«Ü¹ñ ! AvP[VðI¹µÜ·B" -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "vpeB" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - LTEXT "~LT[ foCX(&M):", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "¹ÊÌ²®:", -1, 7,25,211,77 - PUSHBUTTON "Ä¶(&P)", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "^¹(&R)", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "»Ì¼(&O):", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "\\¦·éRg[:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "LZ", IDCANCEL, 168,226,50,14 -END Removed: trunk/reactos/base/applications/sndvol32/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/nl-NL.rc (original) +++ trunk/reactos/base/applications/sndvol32/nl-NL.rc (removed) @@ -1,43 +1,0 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DUTCH - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "O&pties" - BEGIN - MENUITEM "Eigenscha&ppen", IDC_PROPERTIES - MENUITEM "&Geavanceerde volumeregelingen", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Afsluiten", IDC_EXIT - END - POPUP "&Help" - BEGIN - MENUITEM "Help-&onderwerpen", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Info", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Volume Control" - IDS_NOMIXERDEVICES "Er zijn geen actieve mixerapparaten beschikbaar! Deze toepassing wordt nu afgesloten." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Eigenschappen" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Mixerapparaat:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Volume aanpassen voor", -1, 7,25,211,77 - PUSHBUTTON "&Afspelen", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Opnemen", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "O&verig:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "De volgende volumeregelingen weergeven:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Annuleren", IDCANCEL, 168,226,50,14 -END Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.rc (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.rc Tue Nov 28 23:26:23 2006 @@ -8,20 +8,5 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sndvol32.exe\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#include "rsrc.rc" -1 24 DISCARDABLE "manifest.xml" - -IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico - -#include "cs-CZ.rc" -#include "de-DE.rc" -#include "en-US.rc" -#include "fr-FR.rc" -#include "hu-HU.rc" -#include "ja-JP.rc" -#include "nl-NL.rc" -#include "sv-SE.rc" -#include "uk-UA.rc" - - Removed: trunk/reactos/base/applications/sndvol32/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sv-SE.rc (original) +++ trunk/reactos/base/applications/sndvol32/sv-SE.rc (removed) @@ -1,61 +1,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Swedish (SE) resources -/* - * Copyright 2005 David Nordenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Alternativ" - BEGIN - MENUITEM "&Inställningar", IDC_PROPERTIES - MENUITEM "A&vancerade kontroller", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "&Avsluta", IDC_EXIT - END - POPUP "&Hjälp" - BEGIN - MENUITEM "&Hjälpavsnitt", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Om ...", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Volymkontroll" - IDS_NOMIXERDEVICES "Det finns inga ljudmixningsenheter tillgängliga! Programmet kommer nu att avslutas." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Inställningar" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Mixerenhet:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Justera volymen för:", -1, 7,25,211,77 - PUSHBUTTON "&Uppspelning", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Inspelning", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Andra:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14 -END Removed: trunk/reactos/base/applications/sndvol32/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/uk-UA.rc (original) +++ trunk/reactos/base/applications/sndvol32/uk-UA.rc (removed) @@ -1,51 +1,0 @@ -/* - * PROJECT: ReactOS Sound Volume Control - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/sndvol32/Uk.rc - * PURPOSE: Ukraianian Language File for Volume Control - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -IDM_MAINMENU MENU DISCARDABLE -BEGIN - POPUP "&Ïàðàìåòðè" - BEGIN - MENUITEM "&Âëàñòèâîñò³", IDC_PROPERTIES - MENUITEM "&Äîäàòêîâ³ ïàðàìåòðè", IDC_ADVANCED_CONTROLS - MENUITEM SEPARATOR - MENUITEM "Â&èõ³ä", IDC_EXIT - END - POPUP "&Äîâ³äêà" - BEGIN - MENUITEM "&Çì³ñò", IDC_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "&Ïðî ðåãóëÿòîð ãó÷íîñò³", IDC_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_SNDVOL32 "Ðåãóëÿòîð ãó÷íîñò³" - IDS_NOMIXERDEVICES "Àêòèâí³ ïðèñòðî¿-ì³êøåðè íåäîñòóïí³! Äîäàòîê çàê³í÷óº ðîáîòó." -END - -IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Âëàñòèâîñò³" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Ì³êøåð:", -1, 7,8,48,9 - COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP - GROUPBOX "Ðåãóëÿö³ÿ ãó÷íîñò³ äëÿ:", -1, 7,25,211,77 - PUSHBUTTON "&Â³äòâîðåííÿ", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&Çàïèñ", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON - PUSHBUTTON "&²íøå:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED - COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "Â³äîáðàæàòè íàñòóïí³ ðåãóëÿòîðè ãó÷íîñò³:", IDC_LABELCONTROLS, 7, 109, 162, 8 - CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 - - PUSHBUTTON "OK", IDOK, 114,226,50,14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 168,226,50,14 -END

1 0

[greatlrd] 24941: fixing some of the mix betwin hel and hal. (still not complete)
by greatlrd＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: greatlrd Date: Tue Nov 28 23:22:02 2006 New Revision: 24941 URL: http://svn.reactos.org/svn/reactos?rev=24941&view=rev Log: fixing some of the mix betwin hel and hal. (still not complete) Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue Nov 28 23:22:02 2006 @@ -8,6 +8,7 @@ <library>ntdll</library> <library>kernel32</library> + <library>user32</library> <library>gdi32</library> <library>d3d8thk</library> <library>dxguid</library> Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Tue Nov 28 23:22:02 2006 @@ -11,8 +11,6 @@ #include "rosdraw.h" - -#undef DirectDrawCreate CRITICAL_SECTION ddcs; Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue Nov 28 23:22:02 2006 @@ -11,6 +11,7 @@ #include <windows.h> #include "rosdraw.h" #include "d3dhal.h" +#include "ddrawgdi.h" DDRAWI_DIRECTDRAW_GBL ddgbl; DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; @@ -170,6 +171,116 @@ /* Fixme the mix betwin hel and hal */ + This->lpLcl->lpDDCB->cbDDCallbacks.dwSize = sizeof(This->lpLcl->lpDDCB->cbDDCallbacks); + + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CANCREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface = This->lpLcl->lpDDCB->HALDD.CanCreateSurface; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CANCREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface = This->lpLcl->lpDDCB->HELDD.CanCreateSurface; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface = This->lpLcl->lpDDCB->HALDD.CreateSurface; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface = This->lpLcl->lpDDCB->HELDD.CreateSurface; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATEPALETTE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATEPALETTE; + This->lpLcl->lpDDCB->cbDDCallbacks.CreatePalette = This->lpLcl->lpDDCB->HALDD.CreatePalette; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATEPALETTE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATEPALETTE; + This->lpLcl->lpDDCB->cbDDCallbacks.CreatePalette = This->lpLcl->lpDDCB->HELDD.CreatePalette; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_DESTROYDRIVER; + This->lpLcl->lpDDCB->cbDDCallbacks.DestroyDriver = This->lpLcl->lpDDCB->HALDD.DestroyDriver; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_DESTROYDRIVER; + This->lpLcl->lpDDCB->cbDDCallbacks.DestroyDriver = This->lpLcl->lpDDCB->HELDD.DestroyDriver; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_FLIPTOGDISURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.FlipToGDISurface = This->lpLcl->lpDDCB->HALDD.FlipToGDISurface; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_FLIPTOGDISURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.FlipToGDISurface = This->lpLcl->lpDDCB->HELDD.FlipToGDISurface; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_GETSCANLINE; + This->lpLcl->lpDDCB->cbDDCallbacks.GetScanLine = This->lpLcl->lpDDCB->HALDD.GetScanLine; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_GETSCANLINE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_GETSCANLINE; + This->lpLcl->lpDDCB->cbDDCallbacks.GetScanLine = This->lpLcl->lpDDCB->HELDD.GetScanLine; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETCOLORKEY) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETCOLORKEY; + This->lpLcl->lpDDCB->cbDDCallbacks.SetColorKey = This->lpLcl->lpDDCB->HALDD.SetColorKey; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETCOLORKEY) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETCOLORKEY; + This->lpLcl->lpDDCB->cbDDCallbacks.SetColorKey = This->lpLcl->lpDDCB->HELDD.SetColorKey; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETEXCLUSIVEMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.SetExclusiveMode = This->lpLcl->lpDDCB->HALDD.SetExclusiveMode; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETEXCLUSIVEMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.SetExclusiveMode = This->lpLcl->lpDDCB->HELDD.SetExclusiveMode; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETMODE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.SetMode = This->lpLcl->lpDDCB->HALDD.SetMode; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETMODE) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.SetMode = This->lpLcl->lpDDCB->HELDD.SetMode; + } + if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_WAITFORVERTICALBLANK; + This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = This->lpLcl->lpDDCB->HALDD.WaitForVerticalBlank; + } + else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_WAITFORVERTICALBLANK; + This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank; + } + + + + + + + + /* Fill some basic info for Surface */

1 0

[janderwald] 24940: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

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 TuVXe¼" - -IDS_help, "help [R}h]" - -IDS_info, "info [TuVXeID]" - -IDS_reboot, "reboot TuVXeID" - -IDS_shutdown,"shutdown TuVXeID" - - - -IDS_boot_msg, "CÓÌÂ«TuVXeðN®µÜ·B" - -IDS_help_msg, "R}hÌwvðoÍµÜ·B" - -IDS_info_msg, "N®µÄ¢éTuVXeÉÂ¢ÄÌîñðoÍµÜ·B\n\ -TuVXeID ªÈª³ê½êÍAN®µÄ¢é\n\ -Â«TuVXeÌêðoÍµÜ·B" - -IDS_reboot_msg, "CÓÌÂ«TuVXeðÄN®µÜ·B" -IDS_shutdown_msg, "CÓÌÂ«TuVXeðI¹µÜ·B" - -IDS_Unknown, "¢mÌR}h '%s'.\n" - -IDS_SM1, "SM TuVXe fBNg\n\n\ -SSID PID tbO\n\ ----- -------- ------------\n" - -IDS_SM2, "%04x %08lx %04x\n" - -IDS_ID, "TuVXe ID: %d\n\ - tbO: %04x\n\ - vZX ID: %ld\n" - -IDS_Not_Imp, "À³êÄ¢Ü¹ñ\n" - -IDS_Mangers, "ReactOS/Win32 - ZbV }l[W Rg[ c[\n\n" - -IDS_USING, "gp@:\n\ -\tsm\n\ -\tsm help [R}h]\n\ -\tsm R}h [ø]\n\n'sm help' ÆüÍ·éÆApÂ\\ÈR}hÌêðoÍµÜ·B\n" - -IDS_FAILS_MNG, "ZbV }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" +

1 0

[janderwald] 24939: - move resource files
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 23:06:41 2006 New Revision: 24939 URL: http://svn.reactos.org/svn/reactos?rev=24939&view=rev Log: - move resource files Added: trunk/reactos/base/applications/devmgmt/lang/ trunk/reactos/base/applications/devmgmt/lang/de-DE.rc - copied, changed from r24938, trunk/reactos/base/applications/devmgmt/de-DE.rc trunk/reactos/base/applications/devmgmt/lang/en-US.rc - copied, changed from r24938, trunk/reactos/base/applications/devmgmt/en-US.rc trunk/reactos/base/applications/devmgmt/rsrc.rc (with props) Removed: trunk/reactos/base/applications/devmgmt/de-DE.rc trunk/reactos/base/applications/devmgmt/en-US.rc Modified: trunk/reactos/base/applications/devmgmt/devmgmt.rc Removed: trunk/reactos/base/applications/devmgmt/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/de-DE.rc (original) +++ trunk/reactos/base/applications/devmgmt/de-DE.rc (removed) @@ -1,81 +1,0 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT - -IDR_MAINMENU MENU -BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "&Beenden", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Drucken", IDC_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Eigenschaften", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP, GRAYED - END - POPUP "View" - BEGIN - MENUITEM "Geräte nach Typ", IDC_DEVBYTYPE, CHECKED - MENUITEM "Geräte nach Verbindung", IDC_STATIC, GRAYED - MENUITEM "Resourcen nach Typ", IDC_STATIC, GRAYED - MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED - END - POPUP "Help" - BEGIN - MENUITEM "Hilfe", IDC_PROGHELP - MENUITEM "Info", IDC_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Eigenschaften", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP - END -END - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Über Geräte-Manager" -FONT 8,"Tahoma",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 - ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Eigenschaften" - IDS_TOOLTIP_REFRESH "Aktualisieren" - IDS_TOOLTIP_HELP "Hilfe" - IDS_TOOLTIP_EXIT "Beenden" -END - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_EXIT " Das Programm beenden." - IDS_HINT_REFRESH " Die Service-Liste aktualisieren." - IDS_HINT_PROP " Eigenschaften-Seite für die aktuelle Auswahl anzeigen." - IDS_HINT_HELP " Hilfe-Fenster anzeigen." - IDS_HINT_ABOUT " Über ReactOS Geräte-Manager." - - IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale Größe wiederherstellen." - IDS_HINT_SYS_MOVE " Dieses Fenster verschieben." - IDS_HINT_SYS_SIZE " Größe dieses Fensters ändern." - IDS_HINT_SYS_MINIMIZE " Dieses Fenster zu einem Symbol verkleinern." - IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Bildschirmgröße vergrößern." - IDS_HINT_SYS_CLOSE " Dieses Fenster schließen." -END Modified: trunk/reactos/base/applications/devmgmt/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/devmgmt.rc (original) +++ trunk/reactos/base/applications/devmgmt/devmgmt.rc Tue Nov 28 23:06:41 2006 @@ -7,23 +7,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -1 24 DISCARDABLE "manifest.xml" - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ReactOS Device Manager" -END - -IDI_MAIN_ICON ICON "res/computer.ico" -IDB_ROOT_IMAGE BITMAP "res/root.bmp" - -/* main toolbar icons */ -IDB_PROP BITMAP DISCARDABLE "res/properties.bmp" -IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp" -IDB_HELP BITMAP DISCARDABLE "res/help.bmp" -IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" - -#include "de-DE.rc" -#include "en-US.rc" +#include "rsrc.rc" Removed: trunk/reactos/base/applications/devmgmt/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/en-US.rc (original) +++ trunk/reactos/base/applications/devmgmt/en-US.rc (removed) @@ -1,81 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDR_MAINMENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit", IDC_EXIT - END - POPUP "Action" - BEGIN - MENUITEM "Print", IDC_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Help", IDC_PROGHELP, GRAYED - END - POPUP "View" - BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE, CHECKED - MENUITEM "Devices by connection", IDC_STATIC, GRAYED - MENUITEM "Resources by type", IDC_STATIC, GRAYED - MENUITEM "Resources by connection", IDC_STATIC, GRAYED - END - POPUP "Help" - BEGIN - MENUITEM "Help", IDC_PROGHELP - MENUITEM "About", IDC_ABOUT - END -END - -IDR_POPUP MENU -BEGIN - POPUP "popup" - BEGIN - MENUITEM "Properties", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Help", IDC_PROGHELP - END -END - -IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "About Device Manager" -FONT 8,"Tahoma",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 - EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOOLTIP_PROP "Properties" - IDS_TOOLTIP_REFRESH "Refresh" - IDS_TOOLTIP_HELP "Help" - IDS_TOOLTIP_EXIT "Exit" -END - -/* Hints */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_HINT_BLANK " " - IDS_HINT_EXIT " Exits the program." - IDS_HINT_REFRESH " Refresh the service list." - IDS_HINT_PROP " Open property sheet for the current selection." - IDS_HINT_HELP " Display help window." - IDS_HINT_ABOUT " About ReactOS Device Manager." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." -END Copied: trunk/reactos/base/applications/devmgmt/lang/de-DE.rc (from r24938, trunk/reactos/base/applications/devmgmt/de-DE.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/de-DE.rc (original) +++ trunk/reactos/base/applications/devmgmt/lang/de-DE.rc Tue Nov 28 23:06:41 2006 @@ -65,6 +65,7 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN + IDS_APPNAME "ReactOS Geräte-Manager" IDS_HINT_BLANK " " IDS_HINT_EXIT " Das Programm beenden." IDS_HINT_REFRESH " Die Service-Liste aktualisieren." Copied: trunk/reactos/base/applications/devmgmt/lang/en-US.rc (from r24938, trunk/reactos/base/applications/devmgmt/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/en-US.rc (original) +++ trunk/reactos/base/applications/devmgmt/lang/en-US.rc Tue Nov 28 23:06:41 2006 @@ -65,6 +65,7 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN + IDS_APPNAME "ReactOS Device Manager" IDS_HINT_BLANK " " IDS_HINT_EXIT " Exits the program." IDS_HINT_REFRESH " Refresh the service list." Added: trunk/reactos/base/applications/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/rsrc.rc (added) +++ trunk/reactos/base/applications/devmgmt/rsrc.rc Tue Nov 28 23:06:41 2006 @@ -1,0 +1,18 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" + +IDI_MAIN_ICON ICON "res/computer.ico" +IDB_ROOT_IMAGE BITMAP "res/root.bmp" + +/* main toolbar icons */ +IDB_PROP BITMAP DISCARDABLE "res/properties.bmp" +IDB_REFRESH BITMAP DISCARDABLE "res/refresh.bmp" +IDB_HELP BITMAP DISCARDABLE "res/help.bmp" +IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" Propchange: trunk/reactos/base/applications/devmgmt/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 24938: - add uk translation - move resource files See issue #1723 for more details.
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Tue Nov 28 22:47:40 2006 New Revision: 24938 URL: http://svn.reactos.org/svn/reactos?rev=24938&view=rev Log: - add uk translation - move resource files See issue #1723 for more details. Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ trunk/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc - copied unchanged from r24931, trunk/reactos/subsystems/win32/csrss/win32csr/en.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc (with props) trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (with props) Removed: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Removed: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (removed) @@ -1,48 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 - CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, - 7,20,186,13 - LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", - IDC_STATIC,7,40,186,26 - DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 -END - -IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 - PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17 - LTEXT "This program is not responding",IDC_STATIC,7,7,178,8 - LTEXT "To return to ReactOS and check the status of the program, click Cancel", - IDC_STATIC,7,26,178,16 - LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", - IDC_STATIC,7,53,178,26 -END - -STRINGTABLE -BEGIN - IDS_EDIT "Edit" - IDS_MARK "Mark" - IDS_COPY "Copy\tEnter" - IDS_PASTE "Paste" - IDS_SELECTALL "Select All" - IDS_SCROLL "Scroll" - IDS_FIND "Find..." - IDS_DEFAULTS "Defaults" - IDS_PROPERTIES "Properties" - IDS_SCROLLHERE "Scroll Here" - IDS_SCROLLTOP "Scroll Top" - IDS_SCROLLBOTTOM "Scroll Bottom" - IDS_SCROLLPAGE_UP "Page Up" - IDS_SCROLLPAGE_DOWN "Page Down" - IDS_SCROLLUP "Scroll Up" - IDS_SCROLLDOWN "Scroll Down" -END Added: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc Tue Nov 28 22:47:40 2006 @@ -1,0 +1,49 @@ +/* + * PROJECT: ReactOS CSRSS subsystem + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/csrss/win32csr/uk.rc + * PURPOSE: Ukraianian resource file + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåííÿ ïðîãðàìè - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çàâåðøåííÿ ïðîãðàìè... Çà÷åêàéòå",IDC_STATIC,7,7,186,11 + CONTROL "Ïðîãðåñ",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "ßêùî çàâåðøèòè ïðîãðàìó íåãàéíî, òî ìîæíà âòðàòèòè âñ³ íåçáåðåæåí³ äàí³. Ùîá çàâåðøèòè ïðîãðàìó çàðàç, íàòèñí³òü 'Çàâåðøèòè çàðàç'", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&Çàâåðøèòè çàðàç",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çàâåðøåííÿ ïðîãðàìè - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Ñêàñóâàòè",IDCANCEL,142,98,43,17 + PUSHBUTTON "&Çàâåðøèòè çàðàç",IDC_END_NOW,78,98,43,17 + LTEXT "Öÿ ïðîãðàìà íå â³äïîâ³äàº",IDC_STATIC,7,7,178,8 + LTEXT "Ùîá ïîâåðíóòèñÿ ó ReactOS ³ ïåðåâ³ðèòè ñòàí ïðîãðàìè, íàòèñí³òü 'Ñêàñóâàòè'", + IDC_STATIC,7,26,178,16 + LTEXT "ßêùî çàâåðøèòè ïðîãðàìó íåãàéíî, òî ìîæíà âòðàòèòè âñ³ íåçáåðåæåí³ äàí³. Ùîá çàâåðøèòè ïðîãðàìó çàðàç, íàòèñí³òü 'Çàâåðøèòè çàðàç'", + IDC_STATIC,7,53,178,26 +END + +STRINGTABLE +BEGIN + IDS_EDIT "Ðåäàãóâàòè" + IDS_MARK "Âèä³ëèòè" + IDS_COPY "Êîï³þâàòè\tEnter" + IDS_PASTE "Âñòàâèòè" + IDS_SELECTALL "Âèä³ëèòè âñå" + IDS_SCROLL "Ïðîêðóòèòè" + IDS_FIND "Çíàéòè..." + IDS_DEFAULTS "Çàìîâ÷óâàííÿ" + IDS_PROPERTIES "Âëàñòèâîñò³" +END Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Tue Nov 28 22:47:40 2006 @@ -1,0 +1,9 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 ICON DISCARDABLE res/terminal.ico + +#include "lang/en-US.rc" +#include "lang/uk-UA.rc" Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Tue Nov 28 22:47:40 2006 @@ -7,7 +7,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "win32csr.dll\0" #include <reactos/version.rc> -1 ICON DISCARDABLE res/terminal.ico - - -#include "en.rc" +#include "rsrc.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs