Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[gadamopoulos] 71459: [BROWSEUI] - Update the definition of SHEnumClassesOfCategories. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon May 30 19:47:09 2016 New Revision: 71459 URL: http://svn.reactos.org/svn/reactos?rev=71459&view=rev Log: [BROWSEUI] - Update the definition of SHEnumClassesOfCategories. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838 Modified: trunk/reactos/dll/win32/browseui/browseuiord.cpp trunk/reactos/sdk/include/reactos/browseui_undoc.h Modified: trunk/reactos/dll/win32/browseui/browseuiord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseuiord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseuiord.cpp [iso-8859-1] Mon May 30 19:47:09 2016 @@ -139,7 +139,7 @@ /************************************************************************* * SHEnumClassesOfCategories [BROWSEUI.136] */ -extern "C" HRESULT WINAPI SHEnumClassesOfCategories(long param8, long paramC, long param10, long param14, long param18) +extern "C" HRESULT WINAPI SHEnumClassesOfCategories(ULONG cImplemented, CATID *pImplemented, ULONG cRequired, CATID *pRequired, IEnumGUID **out) { return E_NOTIMPL; } Modified: trunk/reactos/sdk/include/reactos/browseui_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/browse… ============================================================================== --- trunk/reactos/sdk/include/reactos/browseui_undoc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/browseui_undoc.h [iso-8859-1] Mon May 30 19:47:09 2016 @@ -124,7 +124,7 @@ HRESULT WINAPI Channel_QuickLaunch(void); HRESULT WINAPI SHGetNavigateTarget(long param8, long paramC, long param10, long param14); HRESULT WINAPI GetInfoTip(IUnknown *param8, long paramC, LPTSTR *param10, long cchMax); -HRESULT WINAPI SHEnumClassesOfCategories(long param8, long paramC, long param10, long param14, long param18); +HRESULT WINAPI SHEnumClassesOfCategories(ULONG cImplemented, CATID *pImplemented, ULONG cRequired, CATID *pRequired, IEnumGUID **out); HRESULT WINAPI SHWriteClassesOfCategories(long param8, long paramC, long param10, long param14, long param18, long param1C, long param20); BOOL WINAPI SHIsExplorerBrowser(); HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags);

8 years, 6 months

[hbelusca] 71458: [CMD]: Harmonize CMD's welcome versioning message format with the one used in the VER command.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 29 17:21:44 2016 New Revision: 71458 URL: http://svn.reactos.org/svn/reactos?rev=71458&view=rev Log: [CMD]: Harmonize CMD's welcome versioning message format with the one used in the VER command. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/lang/cs-CZ.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/tr-TR.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/lang/zh-TW.rc Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun May 29 17:21:44 2016 @@ -1745,8 +1745,8 @@ /* If neither /C or /K was given, display a simple version string */ ConOutChar(_T('\n')); ConOutResPrintf(STRING_REACTOS_VERSION, - _T(KERNEL_RELEASE_STR), - _T(KERNEL_VERSION_BUILD_STR)); + _T(KERNEL_RELEASE_STR), + _T(KERNEL_VERSION_BUILD_STR)); ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); } Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -527,7 +527,7 @@ STRING_REPLACE_ERROR6 "Nebyly nazeleny Å¾Ã¡dnÃ© soubory - %s\n" STRING_REPLACE_ERROR7 "RozÅ¡ÃÅenÃ¡ chyba 32\n" STRING_CMD_INFOLINE " ReactOS PÅÃkazovÃ½ ÅÃ¡dek NapsÃ¡nÃ HELP = NÃ¡povÄda " - STRING_REACTOS_VERSION "OperaÄnÃ systÃ©m ReactOS [Verze %s-%s]\n" + STRING_REACTOS_VERSION "OperaÄnÃ systÃ©m ReactOS [Verze %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Interpret pÅÃkazovÃ©ho ÅÃ¡dku\nVerze %s %s" STRING_VERSION_RUNNING_ON "BÄÅ¾Ã na: " STRING_VERSION_RUNVER "%s [Verze %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -521,7 +521,7 @@ STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n" STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n" STRING_CMD_INFOLINE " ReactOS Eingabeaufforderung HELP eingeben = Hilfe " - STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Eingabeaufforderung\nVersion %s %s" STRING_VERSION_RUNNING_ON "LÃ¤uft in: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -526,7 +526,7 @@ STRING_REPLACE_ERROR6 "ÎÎµ Î²ÏÎÎ¸Î·ÎºÎ±Î½ Î±ÏÏÎµÎ¯Î± - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -522,7 +522,7 @@ STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -524,7 +524,7 @@ STRING_REPLACE_ERROR6 "No se han encontrado archivos - %s\n" STRING_REPLACE_ERROR7 "Error extendido 32\n" STRING_CMD_INFOLINE " Consola de comandos de ReactOS Escribe HELP para ver la ayuda " - STRING_REACTOS_VERSION "Sistema operativo ReactOS [VersiÃ³n %s-%s]\n" + STRING_REACTOS_VERSION "Sistema operativo ReactOS [VersiÃ³n %s %s]\n" STRING_CMD_SHELLINFO "\nIntÃ©rprete de comandos de ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Funcionando en: " STRING_VERSION_RUNVER "%s [VersiÃ³n %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -536,7 +536,7 @@ STRING_REPLACE_ERROR6 "Aucun fichier trouvÃ© - %s\n" STRING_REPLACE_ERROR7 "Erreur Ã©tendue 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterprÃ©teur de ligne de commandes ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Fonctionnant sous: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -506,7 +506,7 @@ STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Parancssor Ã©rtelmezÃµ\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -521,7 +521,7 @@ STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Berjalan pada: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -532,7 +532,7 @@ STRING_REPLACE_ERROR6 "Nessun file trovato - %s\n" STRING_REPLACE_ERROR7 "Errore esteso 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterprete di linea di comando di ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "In esecuzione su: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -529,7 +529,7 @@ STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -520,7 +520,7 @@ STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" STRING_VERSION_RUNNING_ON "KjÃ¸rer pÃ¥: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -526,7 +526,7 @@ STRING_REPLACE_ERROR6 "Nie znaleziono plikÃ³w - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32 - BÅÄd wspÃ³Ådzielenia\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterpreter linii poleceÅ ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "DziaÅajÄcy na: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -557,7 +557,7 @@ STRING_REPLACE_ERROR6 "FiÈierele nu au fost gÄsite - %s\n" STRING_REPLACE_ERROR7 "Eroare ExtinsÄ 32\n" STRING_CMD_INFOLINE " Interpretorul de comenzi ReactOS TastaÈi HELP = Ajutor " - STRING_REACTOS_VERSION "ReactOS [Versiunea %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS [Versiunea %s %s]\n" STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s" STRING_VERSION_RUNNING_ON "OperÃ¢nd pe: " STRING_VERSION_RUNVER "%s [Versiunea %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -531,7 +531,7 @@ STRING_REPLACE_ERROR6 "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð² - %s\n" STRING_REPLACE_ERROR7 "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° 32\n" STRING_CMD_INFOLINE " ReactOS ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° ÐÐ²ÐµÐ´Ð¸ÑÐµ HELP Ð´Ð»Ñ Ð¡Ð¿ÑÐ°Ð²ÐºÐ¸ " - STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑÐ¸Ñ %s-%s]\n" + STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑÐ¸Ñ %s %s]\n" STRING_CMD_SHELLINFO "\nÐÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ ReactOS\nÐÐµÑÑÐ¸Ñ %s %s" STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½ Ð½Ð°: " STRING_VERSION_RUNVER "%s [ÐÐµÑÑÐ¸Ñ %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -528,7 +528,7 @@ STRING_REPLACE_ERROR6 "Å½iadne sÃºbory sa nenaÅ¡li - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "OperaÄnÃ½ systÃ©m ReactOS [Verzia %s-%s]\n" + STRING_REACTOS_VERSION "OperaÄnÃ½ systÃ©m ReactOS [Verzia %s %s]\n" STRING_CMD_SHELLINFO "\nInterprÃ©ter prÃkazovÃ©ho riadku systÃ©mu ReactOS\nVerzia %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -526,7 +526,7 @@ STRING_REPLACE_ERROR6 "Nuk u gjet dokumenti - %s\n" STRING_REPLACE_ERROR7 "Error i zgjatur 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s-%s]\n" + STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s" STRING_VERSION_RUNNING_ON "Funksionon nÃ«: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -520,7 +520,7 @@ STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" STRING_VERSION_RUNNING_ON "KÃ¶rs pÃ¥: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -527,7 +527,7 @@ STRING_REPLACE_ERROR6 "Bir kÃ¼tÃ¼k yok - %s\n" STRING_REPLACE_ERROR7 "Ek YanlÄ±ÅlÄ±k 32\n" STRING_CMD_INFOLINE " ReactOS Komut Ä°stemi HELP yazmak = YardÄ±m " - STRING_REACTOS_VERSION "ReactOS Ä°Åletim Dizgesi [SÃ¼rÃ¼m %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS Ä°Åletim Dizgesi [SÃ¼rÃ¼m %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Komut YatacÄ± YorumlayÄ±cÄ±sÄ±\nSÃ¼rÃ¼m %s %s" STRING_VERSION_RUNNING_ON "Ãzerinde Ã§alÄ±ÅÄ±yor: " STRING_VERSION_RUNVER "%s [SÃ¼rÃ¼m %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -532,7 +532,7 @@ STRING_REPLACE_ERROR6 "Ð¤Ð°Ð¹Ð»Ð¸ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ - %s\n" STRING_REPLACE_ERROR7 "Ð Ð¾Ð·ÑÐ¸ÑÐµÐ½Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑiÐ¹Ð½Ð° Ð¡Ð¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑiÑ %s-%s]\n" + STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑiÐ¹Ð½Ð° Ð¡Ð¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑiÑ %s %s]\n" STRING_CMD_SHELLINFO "\nIÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ° ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½Ð¸Ð¹ Ð½Ð°: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -491,7 +491,7 @@ STRING_REPLACE_ERROR6 "æ²¡ææä»¶è¢«åç° - %s\n" STRING_REPLACE_ERROR7 "æ©å±éè¯¯ 32\n" STRING_CMD_INFOLINE " ReactOS å½ä»¤è¡è§£éå¨ è¾å¥ HELP = å¸®å© " - STRING_REACTOS_VERSION "ReactOS æä½ç³»ç» [çæ¬ %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS æä½ç³»ç» [çæ¬ %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS å½ä»¤è¡è§£éå¨\nçæ¬ %s %s" STRING_VERSION_RUNNING_ON "å¨ ä¸è¿è¡" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" Modified: trunk/reactos/base/shell/cmd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] Sun May 29 17:21:44 2016 @@ -491,7 +491,7 @@ STRING_REPLACE_ERROR6 "æ²ææªæ¡è¢«ç¼ç¾ - %s\n" STRING_REPLACE_ERROR7 "æ´å±é¯èª¤ 32\n" STRING_CMD_INFOLINE " ReactOS å½ä»¤åç´è¯å¨ è¼¸å¥ HELP = å¹«å© " - STRING_REACTOS_VERSION "ReactOS ä½æ¥ç³»çµ± [çæ¬ %s-%s]\n" + STRING_REACTOS_VERSION "ReactOS ä½æ¥ç³»çµ± [çæ¬ %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS å½ä»¤åç´è¯å¨\nçæ¬ %s %s" STRING_VERSION_RUNNING_ON "å¨ ä¸éè¡" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s"

8 years, 7 months

[hbelusca] 71457: [WIN32K]: Improvements to IntPaintDesktop: - Recycle the 'Rect' variable instead of introducing a new one. - Adapt the colour of the ROS desktop version text according to the desk...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 29 15:24:53 2016 New Revision: 71457 URL: http://svn.reactos.org/svn/reactos?rev=71457&view=rev Log: [WIN32K]: Improvements to IntPaintDesktop: - Recycle the 'Rect' variable instead of introducing a new one. - Adapt the colour of the ROS desktop version text according to the desktop brush used and/or whether a wallpaper is used. This is inspired from what is done in the shell. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun May 29 15:24:53 2016 @@ -1067,7 +1067,7 @@ } hWallpaperDC = NtGdiCreateCompatibleDC(hDC); - if(hWallpaperDC != NULL) + if (hWallpaperDC != NULL) { HBITMAP hOldBitmap; @@ -1075,7 +1075,7 @@ if (x > 0 || y > 0) { /* FIXME: Clip out the bitmap - can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" + can be replaced with "NtGdiPatBlt(hDC, x, y, gspv.cxWallpaper, gspv.cyWallpaper, PATCOPY | DSTINVERT);" once we support DSTINVERT */ PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); @@ -1165,19 +1165,19 @@ PWSTR pwszVersion; INT len; NONCLIENTMETRICSW ncm; - HFONT hFont = NULL, hOldFont = NULL; // TODO: Cache it?? - RECTL rect; // FIXME: Use 'Rect' instead of defining yet another var! - COLORREF color_old; + HFONT hFont = NULL, hOldFont = NULL; + COLORREF crText, color_old; UINT align_old; int mode_old; - - if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0)) - { - rect.right = UserGetSystemMetrics(SM_CXSCREEN); - rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); - } - - /* Set up the font (use default otherwise) */ + PDC pdc; + + if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &Rect, 0)) + { + Rect.right = UserGetSystemMetrics(SM_CXSCREEN); + Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + + /* Set up the font (use default one otherwise) */ ncm.cbSize = sizeof(ncm); if (UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) { @@ -1186,9 +1186,37 @@ hOldFont = NtGdiSelectFont(hDC, hFont); } - color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); + if (gspv.hbmWallpaper == NULL) + { + /* Retrieve the brush fill colour */ + PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); + pdc = DC_LockDc(hDC); + if (pdc) + { + crText = pdc->eboFill.ulRGBColor; + DC_UnlockDc(pdc); + } + else + { + crText = RGB(0, 0, 0); + } + NtGdiSelectBrush(hDC, PreviousBrush); + + /* Adjust text colour according to the brush */ + if (GetRValue(crText) + GetGValue(crText) + GetBValue(crText) > 128 * 3) + crText = RGB(0, 0, 0); + else + crText = RGB(255, 255, 255); + } + else + { + /* Always use white when the text is displayed on top of a wallpaper */ + crText = RGB(255, 255, 255); + } + + color_old = IntGdiSetTextColor(hDC, crText); align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); - mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); + mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); /* Display the system version information */ // FIXME: We need different strings for Safe Mode and regular mode. @@ -1197,13 +1225,13 @@ { if (!InSafeMode) { - GreExtTextOutW(hDC, rect.right - 16, rect.bottom - 48, 0, NULL, pwszVersion, len, NULL, 0); + GreExtTextOutW(hDC, Rect.right - 16, Rect.bottom - 48, 0, NULL, pwszVersion, len, NULL, 0); } else { /* Safe Mode: version information text in top center */ IntGdiSetTextAlign(hDC, TA_CENTER | TA_TOP); - GreExtTextOutW(hDC, (rect.right + rect.left)/2, rect.top + 3, 0, NULL, pwszVersion, len, NULL, 0); + GreExtTextOutW(hDC, (Rect.right + Rect.left)/2, Rect.top + 3, 0, NULL, pwszVersion, len, NULL, 0); } } @@ -1212,13 +1240,13 @@ /* Print Safe Mode text in corners */ len = wcslen(s_wszSafeMode); IntGdiSetTextAlign(hDC, TA_LEFT | TA_TOP); - GreExtTextOutW(hDC, rect.left, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); + GreExtTextOutW(hDC, Rect.left, Rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); IntGdiSetTextAlign(hDC, TA_RIGHT | TA_TOP); - GreExtTextOutW(hDC, rect.right, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); + GreExtTextOutW(hDC, Rect.right, Rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); IntGdiSetTextAlign(hDC, TA_LEFT | TA_BASELINE); - GreExtTextOutW(hDC, rect.left, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); + GreExtTextOutW(hDC, Rect.left, Rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BASELINE); - GreExtTextOutW(hDC, rect.right, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); + GreExtTextOutW(hDC, Rect.right, Rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); } IntGdiSetBkMode(hDC, mode_old);

8 years, 7 months

[hbelusca] 71456: [SHELL32]: Correctly clear the listview transparent shadow text flag.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 29 14:55:29 2016 New Revision: 71456 URL: http://svn.reactos.org/svn/reactos?rev=71456&view=rev Log: [SHELL32]: Correctly clear the listview transparent shadow text flag. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sun May 29 14:55:29 2016 @@ -607,7 +607,7 @@ m_ListView.SetTextColor(RGB(0, 0, 0)); else m_ListView.SetTextColor(RGB(255, 255, 255)); - m_ListView.SetExtendedListViewStyle(LVS_EX_TRANSPARENTSHADOWTEXT); + m_ListView.SetExtendedListViewStyle(0, LVS_EX_TRANSPARENTSHADOWTEXT); } } }

8 years, 7 months

[hbelusca] 71455: [WIN32K] - Write the desktop version string using user-defined font (the same as the one used for window caption titles). - Reorganize a bit the code of IntPaintDesktop.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 29 13:18:05 2016 New Revision: 71455 URL: http://svn.reactos.org/svn/reactos?rev=71455&view=rev Log: [WIN32K] - Write the desktop version string using user-defined font (the same as the one used for window caption titles). - Reorganize a bit the code of IntPaintDesktop. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun May 29 13:18:05 2016 @@ -246,30 +246,40 @@ return STATUS_SUCCESS; } -static int GetSystemVersionString(LPWSTR buffer) -{ - int len; -#if 0 // Disabled until versioning in win32k gets correctly implemented (hbelusca). - RTL_OSVERSIONINFOEXW versionInfo; - - versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); - - if (!NT_SUCCESS(RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo))) - return 0; - - if (versionInfo.dwMajorVersion <= 4) - len = swprintf(buffer, - L"ReactOS Version %lu.%lu %s Build %lu", - versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, - versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); +static INT GetSystemVersionString(PWSTR* buffer) +{ + static WCHAR wszVersion[256] = L""; + int len = 0; + + if (!*wszVersion) + { +#if 0 // Disabled until versioning in win32k gets correctly implemented (hbelusca, r66750). + RTL_OSVERSIONINFOEXW versionInfo; + + versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + + if (!NT_SUCCESS(RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo))) + return 0; + + if (versionInfo.dwMajorVersion <= 4) + len = swprintf(wszVersion, + L"ReactOS Version %lu.%lu %s Build %lu", + versionInfo.dwMajorVersion, versionInfo.dwMinorVersion, + versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); + else + len = swprintf(wszVersion, + L"ReactOS %s (Build %lu)", + versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); +#else + len = swprintf(wszVersion, L"ReactOS Version %S %S", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +#endif + } else - len = swprintf(buffer, - L"ReactOS %s (Build %lu)", - versionInfo.szCSDVersion, versionInfo.dwBuildNumber & 0xFFFF); -#else - len = swprintf(buffer, L"ReactOS Version %S %S", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); -#endif - + { + len = wcslen(wszVersion); + } + + *buffer = wszVersion; return len; } @@ -1006,16 +1016,14 @@ BOOL FASTCALL IntPaintDesktop(HDC hDC) { + static WCHAR s_wszSafeMode[] = L"Safe Mode"; // FIXME: Localize! + RECTL Rect; HBRUSH DesktopBrush, PreviousBrush; HWND hWndDesktop; BOOL doPatBlt = TRUE; PWND WndDesktop; - static WCHAR s_wszSafeMode[] = L"Safe Mode"; - int len; - COLORREF color_old; - UINT align_old; - int mode_old; + BOOLEAN InSafeMode; if (GdiGetClipBox(hDC, &Rect) == ERROR) return FALSE; @@ -1026,7 +1034,10 @@ if (!WndDesktop) return FALSE; - if (!UserGetSystemMetrics(SM_CLEANBOOT)) + /* Retrieve the current SafeMode state */ + InSafeMode = (UserGetSystemMetrics(SM_CLEANBOOT) != 0); + + if (!InSafeMode) { DesktopBrush = (HBRUSH)WndDesktop->pcls->hbrBackground; @@ -1149,60 +1160,75 @@ /* * Display the system version on the desktop background */ - - if (g_PaintDesktopVersion || UserGetSystemMetrics(SM_CLEANBOOT)) - { - static WCHAR s_wszVersion[256] = {0}; - RECTL rect; - - if (*s_wszVersion) - { - len = wcslen(s_wszVersion); - } - else - { - len = GetSystemVersionString(s_wszVersion); - } - + if (g_PaintDesktopVersion || InSafeMode) + { + PWSTR pwszVersion; + INT len; + NONCLIENTMETRICSW ncm; + HFONT hFont = NULL, hOldFont = NULL; // TODO: Cache it?? + RECTL rect; // FIXME: Use 'Rect' instead of defining yet another var! + COLORREF color_old; + UINT align_old; + int mode_old; + + if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0)) + { + rect.right = UserGetSystemMetrics(SM_CXSCREEN); + rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + + /* Set up the font (use default otherwise) */ + ncm.cbSize = sizeof(ncm); + if (UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + hFont = GreCreateFontIndirectW(&ncm.lfCaptionFont); + if (hFont) + hOldFont = NtGdiSelectFont(hDC, hFont); + } + + color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); + align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); + mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); + + /* Display the system version information */ + // FIXME: We need different strings for Safe Mode and regular mode. + len = GetSystemVersionString(&pwszVersion); // , InSafeMode); if (len) { - if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0)) + if (!InSafeMode) { - rect.right = UserGetSystemMetrics(SM_CXSCREEN); - rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); - } - - color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); - align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); - mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); - - if (!UserGetSystemMetrics(SM_CLEANBOOT)) - { - GreExtTextOutW(hDC, rect.right - 16, rect.bottom - 48, 0, NULL, s_wszVersion, len, NULL, 0); + GreExtTextOutW(hDC, rect.right - 16, rect.bottom - 48, 0, NULL, pwszVersion, len, NULL, 0); } else { - /* Safe Mode */ - - /* Version information text in top center */ + /* Safe Mode: version information text in top center */ IntGdiSetTextAlign(hDC, TA_CENTER | TA_TOP); - GreExtTextOutW(hDC, (rect.right + rect.left)/2, rect.top + 3, 0, NULL, s_wszVersion, len, NULL, 0); - - /* Safe Mode text in corners */ - len = wcslen(s_wszSafeMode); - IntGdiSetTextAlign(hDC, TA_LEFT | TA_TOP); - GreExtTextOutW(hDC, rect.left, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_RIGHT | TA_TOP); - GreExtTextOutW(hDC, rect.right, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_LEFT | TA_BASELINE); - GreExtTextOutW(hDC, rect.left, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BASELINE); - GreExtTextOutW(hDC, rect.right, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); + GreExtTextOutW(hDC, (rect.right + rect.left)/2, rect.top + 3, 0, NULL, pwszVersion, len, NULL, 0); } - - IntGdiSetBkMode(hDC, mode_old); - IntGdiSetTextAlign(hDC, align_old); - IntGdiSetTextColor(hDC, color_old); + } + + if (InSafeMode) + { + /* Print Safe Mode text in corners */ + len = wcslen(s_wszSafeMode); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_TOP); + GreExtTextOutW(hDC, rect.left, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_TOP); + GreExtTextOutW(hDC, rect.right, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_BASELINE); + GreExtTextOutW(hDC, rect.left, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BASELINE); + GreExtTextOutW(hDC, rect.right, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); + } + + IntGdiSetBkMode(hDC, mode_old); + IntGdiSetTextAlign(hDC, align_old); + IntGdiSetTextColor(hDC, color_old); + + if (hFont) + { + NtGdiSelectFont(hDC, hOldFont); + GreDeleteObject(hFont); } }

8 years, 7 months

[pschweitzer] 71454: [DNSAPI] Don't attempt to dereference a null-ptr in case of DNS resolution failure.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 29 12:12:15 2016 New Revision: 71454 URL: http://svn.reactos.org/svn/reactos?rev=71454&view=rev Log: [DNSAPI] Don't attempt to dereference a null-ptr in case of DNS resolution failure. Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sun May 29 12:12:15 2016 @@ -283,7 +283,8 @@ } } - LastRecord->pNext = 0; + if (LastRecord) + LastRecord->pNext = 0; /* The name */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);

8 years, 7 months

[pschweitzer] 71453: [FREELDR] Properly count used/unused partitions. This fixes booting ReactOS when it is installed on a partition entry after an unused partition entry. Patch by Wim Hueskes CORE...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 29 08:14:24 2016 New Revision: 71453 URL: http://svn.reactos.org/svn/reactos?rev=71453&view=rev Log: [FREELDR] Properly count used/unused partitions. This fixes booting ReactOS when it is installed on a partition entry after an unused partition entry. Patch by Wim Hueskes CORE-11330 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Sun May 29 08:14:24 2016 @@ -28,7 +28,10 @@ ULONG *ActivePartition) { ULONG BootablePartitionCount = 0; + ULONG CurrentPartitionNumber; + ULONG Index; MASTER_BOOT_RECORD MasterBootRecord; + PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; *ActivePartition = 0; @@ -38,26 +41,29 @@ return FALSE; } - // Count the bootable partitions - if (MasterBootRecord.PartitionTable[0].BootIndicator == 0x80) - { - BootablePartitionCount++; - *ActivePartition = 1; - } - if (MasterBootRecord.PartitionTable[1].BootIndicator == 0x80) - { - BootablePartitionCount++; - *ActivePartition = 2; - } - if (MasterBootRecord.PartitionTable[2].BootIndicator == 0x80) - { - BootablePartitionCount++; - *ActivePartition = 3; - } - if (MasterBootRecord.PartitionTable[3].BootIndicator == 0x80) - { - BootablePartitionCount++; - *ActivePartition = 4; + CurrentPartitionNumber = 0; + for (Index=0; Index<4; Index++) + { + ThisPartitionTableEntry = &MasterBootRecord.PartitionTable[Index]; + + if (ThisPartitionTableEntry->SystemIndicator != PARTITION_ENTRY_UNUSED && + ThisPartitionTableEntry->SystemIndicator != PARTITION_EXTENDED && + ThisPartitionTableEntry->SystemIndicator != PARTITION_XINT13_EXTENDED) + { + CurrentPartitionNumber++; + + // Test if this is the bootable partition + if (ThisPartitionTableEntry->BootIndicator == 0x80) + { + BootablePartitionCount++; + *ActivePartition = CurrentPartitionNumber; + + // Copy the partition table entry + RtlCopyMemory(PartitionTableEntry, + ThisPartitionTableEntry, + sizeof(PARTITION_TABLE_ENTRY)); + } + } } // Make sure there was only one bootable partition @@ -71,11 +77,6 @@ ERR("Too many bootable (active) partitions found.\n"); return FALSE; } - - // Copy the partition table entry - RtlCopyMemory(PartitionTableEntry, - &MasterBootRecord.PartitionTable[*ActivePartition - 1], - sizeof(PARTITION_TABLE_ENTRY)); return TRUE; } @@ -87,6 +88,8 @@ ULONG ExtendedPartitionNumber; ULONG ExtendedPartitionOffset; ULONG Index; + ULONG CurrentPartitionNumber; + PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; // Read master boot record if (!DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) @@ -94,68 +97,71 @@ return FALSE; } - // If they are asking for a primary - // partition then things are easy - if (PartitionNumber < 5) - { - // PartitionNumber is one-based and we need it zero-based - PartitionNumber--; - - // Copy the partition table entry - RtlCopyMemory(PartitionTableEntry, &MasterBootRecord.PartitionTable[PartitionNumber], sizeof(PARTITION_TABLE_ENTRY)); - - return TRUE; - } - else - { - // They want an extended partition entry so we will need - // to loop through all the extended partitions on the disk - // and return the one they want. - - ExtendedPartitionNumber = PartitionNumber - 5; - - // Set the initial relative starting sector to 0 - // This is because extended partition starting - // sectors a numbered relative to their parent - ExtendedPartitionOffset = 0; - - for (Index=0; Index<=ExtendedPartitionNumber; Index++) - { - // Get the extended partition table entry - if (!DiskGetFirstExtendedPartitionEntry(&MasterBootRecord, &ExtendedPartitionTableEntry)) - { - return FALSE; - } - - // Adjust the relative starting sector of the partition - ExtendedPartitionTableEntry.SectorCountBeforePartition += ExtendedPartitionOffset; - if (ExtendedPartitionOffset == 0) - { - // Set the start of the parrent extended partition - ExtendedPartitionOffset = ExtendedPartitionTableEntry.SectorCountBeforePartition; - } - // Read the partition boot record - if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionTableEntry.SectorCountBeforePartition, &MasterBootRecord)) - { - return FALSE; - } - - // Get the first real partition table entry - if (!DiskGetFirstPartitionEntry(&MasterBootRecord, PartitionTableEntry)) - { - return FALSE; - } - - // Now correct the start sector of the partition - PartitionTableEntry->SectorCountBeforePartition += ExtendedPartitionTableEntry.SectorCountBeforePartition; - } - - // When we get here we should have the correct entry - // already stored in PartitionTableEntry - // so just return TRUE - return TRUE; - } - + CurrentPartitionNumber = 0; + for (Index=0; Index<4; Index++) + { + ThisPartitionTableEntry = &MasterBootRecord.PartitionTable[Index]; + + if (ThisPartitionTableEntry->SystemIndicator != PARTITION_ENTRY_UNUSED && + ThisPartitionTableEntry->SystemIndicator != PARTITION_EXTENDED && + ThisPartitionTableEntry->SystemIndicator != PARTITION_XINT13_EXTENDED) + { + CurrentPartitionNumber++; + } + + if (PartitionNumber == CurrentPartitionNumber) + { + RtlCopyMemory(PartitionTableEntry, ThisPartitionTableEntry, sizeof(PARTITION_TABLE_ENTRY)); + return TRUE; + } + } + + // They want an extended partition entry so we will need + // to loop through all the extended partitions on the disk + // and return the one they want. + + ExtendedPartitionNumber = PartitionNumber - CurrentPartitionNumber - 1; + + // Set the initial relative starting sector to 0 + // This is because extended partition starting + // sectors a numbered relative to their parent + ExtendedPartitionOffset = 0; + + for (Index=0; Index<=ExtendedPartitionNumber; Index++) + { + // Get the extended partition table entry + if (!DiskGetFirstExtendedPartitionEntry(&MasterBootRecord, &ExtendedPartitionTableEntry)) + { + return FALSE; + } + + // Adjust the relative starting sector of the partition + ExtendedPartitionTableEntry.SectorCountBeforePartition += ExtendedPartitionOffset; + if (ExtendedPartitionOffset == 0) + { + // Set the start of the parrent extended partition + ExtendedPartitionOffset = ExtendedPartitionTableEntry.SectorCountBeforePartition; + } + // Read the partition boot record + if (!DiskReadBootRecord(DriveNumber, ExtendedPartitionTableEntry.SectorCountBeforePartition, &MasterBootRecord)) + { + return FALSE; + } + + // Get the first real partition table entry + if (!DiskGetFirstPartitionEntry(&MasterBootRecord, PartitionTableEntry)) + { + return FALSE; + } + + // Now correct the start sector of the partition + PartitionTableEntry->SectorCountBeforePartition += ExtendedPartitionTableEntry.SectorCountBeforePartition; + } + + // When we get here we should have the correct entry + // already stored in PartitionTableEntry + // so just return TRUE + return TRUE; } BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry)

8 years, 7 months

[hbelusca] 71452: [DESK.CPL] - Remove redundant UI elements in the "Advanced appearance" dialog. - Add the possibility to modify the colors of inactive caption bar text and flat menu highlight (for...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 29 00:57:31 2016 New Revision: 71452 URL: http://svn.reactos.org/svn/reactos?rev=71452&view=rev Log: [DESK.CPL] - Remove redundant UI elements in the "Advanced appearance" dialog. - Add the possibility to modify the colors of inactive caption bar text and flat menu highlight (for XP/2k3+ only). Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pt-BR.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/lang/zh-TW.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Sun May 29 00:57:31 2016 @@ -28,27 +28,24 @@ const ASSIGNMENT g_Assignment[NUM_ELEMENTS] = { {-1, -1, COLOR_DESKTOP, -1, -1, -1}, /* Desktop */ - {SIZE_CAPTION_HEIGHT, -1, COLOR_INACTIVECAPTION, COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, -1}, /* inactive window caption */ + {SIZE_CAPTION_HEIGHT, -1, COLOR_INACTIVECAPTION, COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, COLOR_INACTIVECAPTIONTEXT},/* inactive window caption */ {SIZE_BORDER_WIDTH, -1, COLOR_INACTIVEBORDER, -1, -1, -1}, /* inactive window border */ {SIZE_CAPTION_HEIGHT, -1, COLOR_ACTIVECAPTION, COLOR_GRADIENTACTIVECAPTION, FONT_CAPTION, COLOR_CAPTIONTEXT}, /* active window caption */ {SIZE_BORDER_WIDTH, -1, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ - {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ + {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_MENU, COLOR_MENUHILIGHT, FONT_MENU, COLOR_MENUTEXT}, /* menu */ {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_HIGHLIGHT, -1, -1, COLOR_HIGHLIGHTTEXT},/* marked element */ {-1, -1, COLOR_WINDOW, -1 /*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */ {SIZE_SCROLL_WIDTH, SIZE_SCROLL_HEIGHT, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ - {SIZE_SM_CAPTION_HEIGHT, -1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */ - {-1, -1, -1, -1, -1, -1}, /* symbol caption -- FIXME: Access? */ - {SIZE_CAPTION_HEIGHT, -1, -1, -1, -1, -1}, /* caption bar */ - {-1, -1, -1, -1, -1, COLOR_GRAYTEXT}, /* inactive menu item -- FIXME: Access? */ + {SIZE_SM_CAPTION_HEIGHT, -1, -1, -1, FONT_SMCAPTION, -1}, /* palette (small) window caption */ + {SIZE_CAPTION_HEIGHT, -1, -1, -1, -1, -1}, /* caption bar buttons */ {-1, -1, -1, -1, FONT_MESSAGE, COLOR_WINDOWTEXT}, /* dialog */ - {-1, -1, -1, -1, -1, -1}, /* scrollbar controls -- FIXME: Access? */ {-1, -1, COLOR_APPWORKSPACE, -1, -1, -1}, /* application background */ - {-1, -1, -1, -1, -1, -1}, /* small caption bar -- FIXME: Access? */ - {SIZE_ICON_SPACE_X, -1, -1, -1, -1, -1}, /* symbol distance horiz. */ - {SIZE_ICON_SPACE_Y, -1, -1, -1, -1, -1}, /* symbol distance vert. */ + {SIZE_ICON_SPACE_X, -1, -1, -1, -1, -1}, /* icon distance horiz. */ + {SIZE_ICON_SPACE_Y, -1, -1, -1, -1, -1}, /* icon distance vert. */ {-1, -1, COLOR_INFOBK, -1, FONT_STATUS, COLOR_INFOTEXT}, /* quickinfo */ - {SIZE_ICON, -1, -1, -1, FONT_ICON, -1} /* symbol */ + {SIZE_ICON, -1, -1, -1, FONT_ICON, -1}, /* icon */ +// {-1, -1, -1, -1, -1, COLOR_GRAYTEXT}, /* inactive menu item -- FIXME: Access? */ }; /******************************************************************************/ @@ -243,7 +240,7 @@ PLOGFONTW plfFont = SchemeGetFont(&g->SchemeAdv, g_Assignment[iElement].Font); SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, plfFont->lfFaceName); - SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, -MulDiv(plfFont->lfHeight, 72, GetDeviceCaps(hdcDlg, LOGPIXELSY)),FALSE); + SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, -MulDiv(plfFont->lfHeight, 72, GetDeviceCaps(hdcDlg, LOGPIXELSY)), FALSE); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, CB_FINDSTRINGEXACT, -1, (WPARAM)plfFont->lfFaceName); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_SETCHECK, plfFont->lfWeight == FW_BOLD?1:0, 0); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_SETCHECK, plfFont->lfItalic, 0); @@ -362,7 +359,7 @@ /* Add the elements to the combo */ for (iElement = 0; iElement < NUM_ELEMENTS; iElement++) { - LoadString(hApplet, IDS_ELEMENT_1 + iElement, (LPTSTR)&tstrText, 79); + LoadString(hApplet, IDS_ELEMENT_0 + iElement, (LPTSTR)&tstrText, 79); iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_ADDSTRING, 0, (LPARAM)&tstrText); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)iElement); } Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Sun May 29 00:57:31 2016 @@ -22,7 +22,7 @@ #define FONT_MESSAGE 4 #define FONT_ICON 5 -#define NUM_ELEMENTS 22 +#define NUM_ELEMENTS 18 #define NUM_FONTS 6 #define NUM_SIZES 9 #define NUM_COLORS 31 Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Ð Ð°Ð±Ð¾ÑÐ½Ð° Ð¿Ð»Ð¾Ñ" - IDS_ELEMENT_2 "ÐÐ°Ð´Ð¿Ð¸ÑÐ²Ð°Ð½Ð¸Ñ Ð½Ð° Ð½ÐµÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" - IDS_ELEMENT_3 "Ð Ð°Ð¼ÐºÐ° Ð½Ð° Ð½ÐµÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" - IDS_ELEMENT_4 "ÐÐ°Ð´Ð¿Ð¸ÑÐ²Ð°Ð½Ð¸Ñ Ð½Ð° ÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" - IDS_ELEMENT_5 "Ð Ð°Ð¼ÐºÐ° Ð½Ð° ÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" - IDS_ELEMENT_6 "ÐÐµÐ½Ñ" - IDS_ELEMENT_7 "ÐÐ¾Ð´ÑÐºÐ°Ð·ÐºÐ¸" - IDS_ELEMENT_8 "ÐÑÐ¾Ð·Ð¾ÑÑÐ¸" - IDS_ELEMENT_9 "ÐÐ»ÑÐ·Ð³Ð°ÑÐ¸" - IDS_ELEMENT_10 "Ð¢ÑÐ¸Ð¼ÐµÑÐ½Ð¸ Ð¿ÑÐµÐ´Ð¼ÐµÑÐ¸" - IDS_ELEMENT_11 "Ð¦Ð²ÑÑ Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÑÑÐ°" - IDS_ELEMENT_12 "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð½Ð¾ Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ðµ" - IDS_ELEMENT_13 "ÐÐ°Ð´Ð¿Ð¸ÑÐ½Ð° Ð»ÐµÐ½ÑÐ°" - IDS_ELEMENT_14 "ÐÐµÑÐµÐºÑÑÐ¸ ÑÐ°ÑÑÐ¸ Ð¾Ñ Ð¼ÐµÐ½ÑÑÐ¾" - IDS_ELEMENT_15 "ÐÑÐ¿ÑÐ¾ÑÐ¸ÑÐµÐ»ÐµÐ½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" - IDS_ELEMENT_16 "Ð£Ð¿ÑÐ°Ð²Ð»ÑÐ²Ð°ÑÐ¸ Ð¿Ð»ÑÐ·Ð³Ð°ÑÐ¸" - IDS_ELEMENT_17 "ÐÐ¾Ð´ÐºÑÐ°ÑÐºÐ° Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ°" - IDS_ELEMENT_18 "ÐÐ¾Ð´Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ñ" - IDS_ELEMENT_19 "ÐÐ¾Ð´Ð¾ÑÐ°Ð²Ð½Ð° ÑÐ°Ð·ÑÐµÐ´ÐºÐ°" - IDS_ELEMENT_20 "ÐÑÐ²ÐµÑÐ½Ð° ÑÐ°Ð·ÑÐµÐ´ÐºÐ°" - IDS_ELEMENT_21 "ÐÑÑÐ·Ð¸ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ" - IDS_ELEMENT_22 "Ð¡Ð¸Ð¼Ð²Ð¾Ð»" + IDS_ELEMENT_0 "Ð Ð°Ð±Ð¾ÑÐ½Ð° Ð¿Ð»Ð¾Ñ" + IDS_ELEMENT_1 "ÐÐ°Ð´Ð¿Ð¸ÑÐ²Ð°Ð½Ð¸Ñ Ð½Ð° Ð½ÐµÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" + IDS_ELEMENT_2 "Ð Ð°Ð¼ÐºÐ° Ð½Ð° Ð½ÐµÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" + IDS_ELEMENT_3 "ÐÐ°Ð´Ð¿Ð¸ÑÐ²Ð°Ð½Ð¸Ñ Ð½Ð° ÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" + IDS_ELEMENT_4 "Ð Ð°Ð¼ÐºÐ° Ð½Ð° ÑÐµÐºÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸" + IDS_ELEMENT_5 "ÐÐµÐ½Ñ" + IDS_ELEMENT_6 "ÐÐ¾Ð´ÑÐºÐ°Ð·ÐºÐ¸" + IDS_ELEMENT_7 "ÐÑÐ¾Ð·Ð¾ÑÑÐ¸" + IDS_ELEMENT_8 "ÐÐ»ÑÐ·Ð³Ð°ÑÐ¸" + IDS_ELEMENT_9 "Ð¢ÑÐ¸Ð¼ÐµÑÐ½Ð¸ Ð¿ÑÐµÐ´Ð¼ÐµÑÐ¸" + IDS_ELEMENT_10 "Ð¦Ð²ÑÑ Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ð¸ÑÑÐ°" + IDS_ELEMENT_11 "ÐÐ°Ð´Ð¿Ð¸ÑÐ½Ð° Ð»ÐµÐ½ÑÐ°" + IDS_ELEMENT_12 "ÐÑÐ¿ÑÐ¾ÑÐ¸ÑÐµÐ»ÐµÐ½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" + IDS_ELEMENT_13 "ÐÐ¾Ð´ÐºÑÐ°ÑÐºÐ° Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ°" + IDS_ELEMENT_14 "ÐÐ¾Ð´Ð¾ÑÐ°Ð²Ð½Ð° ÑÐ°Ð·ÑÐµÐ´ÐºÐ°" + IDS_ELEMENT_15 "ÐÑÐ²ÐµÑÐ½Ð° ÑÐ°Ð·ÑÐµÐ´ÐºÐ°" + IDS_ELEMENT_16 "ÐÑÑÐ·Ð¸ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ" + IDS_ELEMENT_17 "Ð¡Ð¸Ð¼Ð²Ð¾Ð»" +// IDS_ELEMENT_18 "ÐÐµÑÐµÐºÑÑÐ¸ ÑÐ°ÑÑÐ¸ Ð¾Ñ Ð¼ÐµÐ½ÑÑÐ¾" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -232,28 +232,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Plocha" - IDS_ELEMENT_2 "NeaktivnÃ zÃ¡hlavÃ" - IDS_ELEMENT_3 "Okraj neaktivnÃho okna" - IDS_ELEMENT_4 "AktivnÃ zÃ¡hlavÃ" - IDS_ELEMENT_5 "Okraj aktivnÃho okna" - IDS_ELEMENT_6 "NabÃdka" - IDS_ELEMENT_7 "VybranÃ¡ poloÅ¾ka" - IDS_ELEMENT_8 "Okno" - IDS_ELEMENT_9 "PosuvnÃk" - IDS_ELEMENT_10 "3D objekty" - IDS_ELEMENT_11 "Paleta" - IDS_ELEMENT_12 "Popis ikon" - IDS_ELEMENT_13 "TlaÄÃtka zÃ¡hlavÃ" - IDS_ELEMENT_14 "NepÅÃstupnÃ© poloÅ¾ky" - IDS_ELEMENT_15 "Okno zprÃ¡vy" - IDS_ELEMENT_16 "OvlÃ¡dÃ¡nÃ posuvnÃku" - IDS_ELEMENT_17 "PozadÃ aplikace" - IDS_ELEMENT_18 "TlaÄÃtka zÃ¡hlavÃ (malÃ¡)" - IDS_ELEMENT_19 "Rozestup ikon (vodorovnÄ)" - IDS_ELEMENT_20 "Rozestup ikon (svisle)" - IDS_ELEMENT_21 "Popis tlaÄÃtek" - IDS_ELEMENT_22 "Ikona" + IDS_ELEMENT_0 "Plocha" + IDS_ELEMENT_1 "NeaktivnÃ zÃ¡hlavÃ" + IDS_ELEMENT_2 "Okraj neaktivnÃho okna" + IDS_ELEMENT_3 "AktivnÃ zÃ¡hlavÃ" + IDS_ELEMENT_4 "Okraj aktivnÃho okna" + IDS_ELEMENT_5 "NabÃdka" + IDS_ELEMENT_6 "VybranÃ¡ poloÅ¾ka" + IDS_ELEMENT_7 "Okno" + IDS_ELEMENT_8 "PosuvnÃk" + IDS_ELEMENT_9 "3D objekty" + IDS_ELEMENT_10 "Paleta" + IDS_ELEMENT_11 "TlaÄÃtka zÃ¡hlavÃ" + IDS_ELEMENT_12 "Okno zprÃ¡vy" + IDS_ELEMENT_13 "PozadÃ aplikace" + IDS_ELEMENT_14 "Rozestup ikon (vodorovnÄ)" + IDS_ELEMENT_15 "Rozestup ikon (svisle)" + IDS_ELEMENT_16 "Popis tlaÄÃtek" + IDS_ELEMENT_17 "Ikona" +// IDS_ELEMENT_18 "NepÅÃstupnÃ© poloÅ¾ky" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Titelleiste der inaktiven Fenster" - IDS_ELEMENT_3 "Rahmen der inaktiven Fenster" - IDS_ELEMENT_4 "Titelleiste des aktiven Fensters" - IDS_ELEMENT_5 "Rahmen des aktiven Fensters" - IDS_ELEMENT_6 "MenÃ¼" - IDS_ELEMENT_7 "Markierte Elemente" - IDS_ELEMENT_8 "Fenster" - IDS_ELEMENT_9 "Bildlaufleiste" - IDS_ELEMENT_10 "3D-Objekte" - IDS_ELEMENT_11 "Palettentitel" - IDS_ELEMENT_12 "Symboltitel" - IDS_ELEMENT_13 "TitelleistenschaltflÃ¤che" - IDS_ELEMENT_14 "Deaktiviertes MenÃ¼element" - IDS_ELEMENT_15 "Dialogfeld" - IDS_ELEMENT_16 "Bildlaufleisten-SchaltflÃ¤chen" - IDS_ELEMENT_17 "Hintergrund der Anwendung" - IDS_ELEMENT_18 "Kleine TitelleistenschaltflÃ¤che" - IDS_ELEMENT_19 "Symbolabstand (Horizontal)" - IDS_ELEMENT_20 "Symbolabstand (Vertikal)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Titelleiste der inaktiven Fenster" + IDS_ELEMENT_2 "Rahmen der inaktiven Fenster" + IDS_ELEMENT_3 "Titelleiste des aktiven Fensters" + IDS_ELEMENT_4 "Rahmen des aktiven Fensters" + IDS_ELEMENT_5 "MenÃ¼" + IDS_ELEMENT_6 "Markierte Elemente" + IDS_ELEMENT_7 "Fenster" + IDS_ELEMENT_8 "Bildlaufleiste" + IDS_ELEMENT_9 "3D-Objekte" + IDS_ELEMENT_10 "Palettentitel" + IDS_ELEMENT_11 "TitelleistenschaltflÃ¤che" + IDS_ELEMENT_12 "Dialogfeld" + IDS_ELEMENT_13 "Hintergrund der Anwendung" + IDS_ELEMENT_14 "Symbolabstand (Horizontal)" + IDS_ELEMENT_15 "Symbolabstand (Vertikal)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Symbol" +// IDS_ELEMENT_18 "Deaktiviertes MenÃ¼element" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "ÎÏÎ¹ÏÎ¬Î½ÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï" - IDS_ELEMENT_2 "ÎÎ½ÎµÎ½ÎµÏÎ³Î® Î³ÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" - IDS_ELEMENT_3 "Î Î»Î±Î¯ÏÎ¹Î¿ Î±Î½ÎµÎ½ÎµÏÎ³Î¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï" - IDS_ELEMENT_4 "ÎÎ½ÎµÏÎ³Î® Î³ÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" - IDS_ELEMENT_5 "Î Î»Î±Î¯ÏÎ¹Î¿ ÎµÎ½ÎµÏÎ³Î¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï" - IDS_ELEMENT_6 "ÎÎµÎ½Î¿Ï" - IDS_ELEMENT_7 "ÎÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î± ÏÏÎ¿Î¹ÏÎµÎ¯Î±" - IDS_ELEMENT_8 "Î Î±ÏÎ¬Î¸ÏÏÎ¿" - IDS_ELEMENT_9 "ÎÏÎ±Î¼Î¼Î® ÎºÏÎ»Î¹ÏÎ·Ï" - IDS_ELEMENT_10 "ÎÎ½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î± 3-Î" - IDS_ELEMENT_11 "Î¤Î¯ÏÎ»Î¿Ï ÏÎ±Î»ÎÏÎ±Ï" - IDS_ELEMENT_12 "Î¤Î¯ÏÎ»Î¿Ï ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯Î¿Ï" - IDS_ELEMENT_13 "ÎÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" - IDS_ELEMENT_14 "ÎÎµÎ½ÎµÏÎ³Î¬ ÏÏÎ¿Î¹ÏÎµÎ¯Î± Î¼ÎµÎ½Î¿Ï" - IDS_ELEMENT_15 "Î Î±ÏÎ¬Î¸ÏÏÎ¿ Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï" - IDS_ELEMENT_16 "ÎÏÎ±Î¼Î¼Î® ÎºÏÎ»Î¹ÏÎ·Ï" - IDS_ELEMENT_17 "Î¦ÏÎ½ÏÎ¿ ÎµÏÎ±ÏÎ¼Î¿Î³ÏÎ½" - IDS_ELEMENT_18 "ÎÎ¹ÎºÏÎ® Î³ÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" - IDS_ELEMENT_19 "ÎÎ¹Î¬ÎºÎµÎ½Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯ÏÎ½ (Î¿ÏÎ¹Î¶ÏÎ½ÏÎ¹Î¿)" - IDS_ELEMENT_20 "ÎÎ¹Î¬ÎºÎµÎ½Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯ÏÎ½ (ÎºÎ±ÏÎ±ÎºÏÏÏÏÎ¿)" - IDS_ELEMENT_21 "ÎÏÎ®Î³Î¿ÏÎ· ÎµÏÎµÎ¾Î®Î³Î·ÏÎ·" - IDS_ELEMENT_22 "ÎÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿" + IDS_ELEMENT_0 "ÎÏÎ¹ÏÎ¬Î½ÎµÎ¹Î± ÎµÏÎ³Î±ÏÎ¯Î±Ï" + IDS_ELEMENT_1 "ÎÎ½ÎµÎ½ÎµÏÎ³Î® Î³ÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" + IDS_ELEMENT_2 "Î Î»Î±Î¯ÏÎ¹Î¿ Î±Î½ÎµÎ½ÎµÏÎ³Î¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï" + IDS_ELEMENT_3 "ÎÎ½ÎµÏÎ³Î® Î³ÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" + IDS_ELEMENT_4 "Î Î»Î±Î¯ÏÎ¹Î¿ ÎµÎ½ÎµÏÎ³Î¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï" + IDS_ELEMENT_5 "ÎÎµÎ½Î¿Ï" + IDS_ELEMENT_6 "ÎÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î± ÏÏÎ¿Î¹ÏÎµÎ¯Î±" + IDS_ELEMENT_7 "Î Î±ÏÎ¬Î¸ÏÏÎ¿" + IDS_ELEMENT_8 "ÎÏÎ±Î¼Î¼Î® ÎºÏÎ»Î¹ÏÎ·Ï" + IDS_ELEMENT_9 "ÎÎ½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î± 3-Î" + IDS_ELEMENT_10 "Î¤Î¯ÏÎ»Î¿Ï ÏÎ±Î»ÎÏÎ±Ï" + IDS_ELEMENT_11 "ÎÏÎ±Î¼Î¼Î® ÏÎ¯ÏÎ»Î¿Ï" + IDS_ELEMENT_12 "Î Î±ÏÎ¬Î¸ÏÏÎ¿ Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï" + IDS_ELEMENT_13 "Î¦ÏÎ½ÏÎ¿ ÎµÏÎ±ÏÎ¼Î¿Î³ÏÎ½" + IDS_ELEMENT_14 "ÎÎ¹Î¬ÎºÎµÎ½Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯ÏÎ½ (Î¿ÏÎ¹Î¶ÏÎ½ÏÎ¹Î¿)" + IDS_ELEMENT_15 "ÎÎ¹Î¬ÎºÎµÎ½Î¿ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯ÏÎ½ (ÎºÎ±ÏÎ±ÎºÏÏÏÏÎ¿)" + IDS_ELEMENT_16 "ÎÏÎ®Î³Î¿ÏÎ· ÎµÏÎµÎ¾Î®Î³Î·ÏÎ·" + IDS_ELEMENT_17 "ÎÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿" +// IDS_ELEMENT_18 "ÎÎµÎ½ÎµÏÎ³Î¬ ÏÏÎ¿Î¹ÏÎµÎ¯Î± Î¼ÎµÎ½Î¿Ï" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Selected Items" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Selected Items" + IDS_ELEMENT_7 "Windows" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objects" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Application background" + IDS_ELEMENT_14 "Icon distance (horizontal)" + IDS_ELEMENT_15 "Icon distance (vertical)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Icon" +// IDS_ELEMENT_18 "Deactivated menu elements" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Escritorio" - IDS_ELEMENT_2 "Barra de ventana inactiva" - IDS_ELEMENT_3 "Borde de ventana inactiva" - IDS_ELEMENT_4 "Barra de ventana activa" - IDS_ELEMENT_5 "Borde de ventana activa" - IDS_ELEMENT_6 "MenÃº" - IDS_ELEMENT_7 "Elementos seleccionados" - IDS_ELEMENT_8 "Ventanas" - IDS_ELEMENT_9 "Barra de desplazamiento" - IDS_ELEMENT_10 "Objetos 3D" - IDS_ELEMENT_11 "TÃtulo de la paleta" - IDS_ELEMENT_12 "Botones de tÃtulo" - IDS_ELEMENT_13 "Barra de tÃtulo" - IDS_ELEMENT_14 "Elementos deshabilitados del menÃº" - IDS_ELEMENT_15 "Cuadro de mensaje" - IDS_ELEMENT_16 "Controles de barra de desplazamiento" - IDS_ELEMENT_17 "Fondo de la aplicaciÃ³n" - IDS_ELEMENT_18 "Barra de tÃtulo pequeÃ±a" - IDS_ELEMENT_19 "Espacio entre iconos (horizontal)" - IDS_ELEMENT_20 "Espacio entre iconos (vertical)" - IDS_ELEMENT_21 "Barra de estado" - IDS_ELEMENT_22 "Icono" + IDS_ELEMENT_0 "Escritorio" + IDS_ELEMENT_1 "Barra de ventana inactiva" + IDS_ELEMENT_2 "Borde de ventana inactiva" + IDS_ELEMENT_3 "Barra de ventana activa" + IDS_ELEMENT_4 "Borde de ventana activa" + IDS_ELEMENT_5 "MenÃº" + IDS_ELEMENT_6 "Elementos seleccionados" + IDS_ELEMENT_7 "Ventanas" + IDS_ELEMENT_8 "Barra de desplazamiento" + IDS_ELEMENT_9 "Objetos 3D" + IDS_ELEMENT_10 "TÃtulo de la paleta" + IDS_ELEMENT_11 "Barra de tÃtulo" + IDS_ELEMENT_12 "Cuadro de mensaje" + IDS_ELEMENT_13 "Fondo de la aplicaciÃ³n" + IDS_ELEMENT_14 "Espacio entre iconos (horizontal)" + IDS_ELEMENT_15 "Espacio entre iconos (vertical)" + IDS_ELEMENT_16 "Barra de estado" + IDS_ELEMENT_17 "Icono" +// IDS_ELEMENT_18 "Elementos deshabilitados del menÃº" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Bureau" - IDS_ELEMENT_2 "Titre de fenÃªtres inactives" - IDS_ELEMENT_3 "Bord de fenÃªtres inactives" - IDS_ELEMENT_4 "Titre de fenÃªtres actives" - IDS_ELEMENT_5 "Bord de fenÃªtres actives" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "ÃlÃ©ments sÃ©lectionnÃ©s" - IDS_ELEMENT_8 "FenÃªtres" - IDS_ELEMENT_9 "Barres de dÃ©filement" - IDS_ELEMENT_10 "Objets 3D " - IDS_ELEMENT_11 "Titre de palette" - IDS_ELEMENT_12 "Titre d'icÃ´ne" - IDS_ELEMENT_13 "Barre de titre" - IDS_ELEMENT_14 "ÃlÃ©ments de menu dÃ©sactivÃ©s" - IDS_ELEMENT_15 "FenÃªtre de dialogue" - IDS_ELEMENT_16 "ContrÃ´les de dÃ©filement" - IDS_ELEMENT_17 "Fond de l'application" - IDS_ELEMENT_18 "Petite barre de titre" - IDS_ELEMENT_19 "Espace entre les icÃ´nes (horizontal)" - IDS_ELEMENT_20 "Espace entre les icÃ´nes (vertical)" - IDS_ELEMENT_21 "Info rapide" - IDS_ELEMENT_22 "Symbole" + IDS_ELEMENT_0 "Bureau" + IDS_ELEMENT_1 "Titre de fenÃªtres inactives" + IDS_ELEMENT_2 "Bord de fenÃªtres inactives" + IDS_ELEMENT_3 "Titre de fenÃªtres actives" + IDS_ELEMENT_4 "Bord de fenÃªtres actives" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "ÃlÃ©ments sÃ©lectionnÃ©s" + IDS_ELEMENT_7 "FenÃªtres" + IDS_ELEMENT_8 "Barres de dÃ©filement" + IDS_ELEMENT_9 "Objets 3D " + IDS_ELEMENT_10 "Titre de palette" + IDS_ELEMENT_11 "Boutons de barre de titre" + IDS_ELEMENT_12 "FenÃªtre de dialogue" + IDS_ELEMENT_13 "Fond de l'application" + IDS_ELEMENT_14 "Espace entre les icÃ´nes (horizontal)" + IDS_ELEMENT_15 "Espace entre les icÃ´nes (vertical)" + IDS_ELEMENT_16 "Info rapide" + IDS_ELEMENT_17 "IcÃ´ne" +// IDS_ELEMENT_18 "ÃlÃ©ments de menu dÃ©sactivÃ©s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "×©×××× ×¢××××" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "×ª×¤×¨××" - IDS_ELEMENT_7 "×¤×¨×××× × ×××¨××" - IDS_ELEMENT_8 "×××× ××ª" - IDS_ELEMENT_9 "×¡×¨××× ×××××" - IDS_ELEMENT_10 "×¢×¦××× ×ª××ª ×××××××" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "×ª×××ª ×× ×©××" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_0 "×©×××× ×¢××××" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "×ª×¤×¨××" + IDS_ELEMENT_6 "×¤×¨×××× × ×××¨××" + IDS_ELEMENT_7 "×××× ××ª" + IDS_ELEMENT_8 "×¡×¨××× ×××××" + IDS_ELEMENT_9 "×¢×¦××× ×ª××ª ×××××××" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "×ª×××ª ×× ×©××" + IDS_ELEMENT_13 "Application background" + IDS_ELEMENT_14 "Icon distance (horizontal)" + IDS_ELEMENT_15 "Icon distance (vertical)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Icon" +// IDS_ELEMENT_18 "Deactivated menu elements" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Selected Items" + IDS_ELEMENT_7 "Windows" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objects" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Application background" + IDS_ELEMENT_14 "Icon distance (horizontal)" + IDS_ELEMENT_15 "Icon distance (vertical)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Icon" +// IDS_ELEMENT_18 "Deactivated menu elements" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Judul jendela inaktif" - IDS_ELEMENT_3 "Bingkai jendela inaktif" - IDS_ELEMENT_4 "Judul jendela aktif" - IDS_ELEMENT_5 "Bingkai jendela aktif" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Elemen diterangi" - IDS_ELEMENT_8 "Jendela" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "Obyek 3D" - IDS_ELEMENT_11 "Judul Palet" - IDS_ELEMENT_12 "Judul Simbol" - IDS_ELEMENT_13 "Bar judul" - IDS_ELEMENT_14 "Elemen menu Deaktivasi" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Kontrol Scrollbar" - IDS_ELEMENT_17 "Latar belakang aplikasi" - IDS_ELEMENT_18 "Bar judul kecil" - IDS_ELEMENT_19 "Jarak Simbol (horisontal)" - IDS_ELEMENT_20 "Jarak Simbol (vertikal)" - IDS_ELEMENT_21 "InfoCepat" - IDS_ELEMENT_22 "Simbol" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Judul jendela inaktif" + IDS_ELEMENT_2 "Bingkai jendela inaktif" + IDS_ELEMENT_3 "Judul jendela aktif" + IDS_ELEMENT_4 "Bingkai jendela aktif" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Elemen diterangi" + IDS_ELEMENT_7 "Jendela" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "Obyek 3D" + IDS_ELEMENT_10 "Judul Palet" + IDS_ELEMENT_11 "Bar judul" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Latar belakang aplikasi" + IDS_ELEMENT_14 "Jarak Simbol (horisontal)" + IDS_ELEMENT_15 "Jarak Simbol (vertikal)" + IDS_ELEMENT_16 "InfoCepat" + IDS_ELEMENT_17 "Simbol" +// IDS_ELEMENT_18 "Elemen menu Deaktivasi" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Titolo di una finestra non attiva" - IDS_ELEMENT_3 "Bordo di una finestra non attiva" - IDS_ELEMENT_4 "Titolo di una finestra attiva" - IDS_ELEMENT_5 "Bordo di una finestra non attiva" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Elementi evidenziati" - IDS_ELEMENT_8 "Finestre" - IDS_ELEMENT_9 "Barre di scorrimento" - IDS_ELEMENT_10 "Oggetti 3d" - IDS_ELEMENT_11 "Titolo della palette" - IDS_ELEMENT_12 "Titolo dei simboli" - IDS_ELEMENT_13 "Barra del titolo" - IDS_ELEMENT_14 "Elementi dei menu disattivati" - IDS_ELEMENT_15 "Dialogo" - IDS_ELEMENT_16 "Controlli della barra di scorrimento" - IDS_ELEMENT_17 "Sfondo della applicazione" - IDS_ELEMENT_18 "Barra del titolo piccola" - IDS_ELEMENT_19 "Distanza tra i simboli (orizzontale)" - IDS_ELEMENT_20 "Distanza tra i simboli (verticale)" - IDS_ELEMENT_21 "Informazioni rapide" - IDS_ELEMENT_22 "Simbolo" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Titolo di una finestra non attiva" + IDS_ELEMENT_2 "Bordo di una finestra non attiva" + IDS_ELEMENT_3 "Titolo di una finestra attiva" + IDS_ELEMENT_4 "Bordo di una finestra non attiva" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Elementi evidenziati" + IDS_ELEMENT_7 "Finestre" + IDS_ELEMENT_8 "Barre di scorrimento" + IDS_ELEMENT_9 "Oggetti 3d" + IDS_ELEMENT_10 "Titolo della palette" + IDS_ELEMENT_11 "Barra del titolo" + IDS_ELEMENT_12 "Dialogo" + IDS_ELEMENT_13 "Sfondo della applicazione" + IDS_ELEMENT_14 "Distanza tra i simboli (orizzontale)" + IDS_ELEMENT_15 "Distanza tra i simboli (verticale)" + IDS_ELEMENT_16 "Informazioni rapide" + IDS_ELEMENT_17 "Simbolo" +// IDS_ELEMENT_18 "Elementi dei menu disattivati" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "ãã¹ã¯ããã" - IDS_ELEMENT_2 "éã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ã¿ã¤ãã«" - IDS_ELEMENT_3 "éã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ç¸" - IDS_ELEMENT_4 "ã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ã¿ã¤ãã«" - IDS_ELEMENT_5 "ã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ç¸" - IDS_ELEMENT_6 "ã¡ãã¥ã¼" - IDS_ELEMENT_7 "é¸æãããé ç®" - IDS_ELEMENT_8 "ã¦ã£ã³ãã¦" - IDS_ELEMENT_9 "ã¹ã¯ãã¼ã« ãã¼" - IDS_ELEMENT_10 "3D ãªãã¸ã§ã¯ã" - IDS_ELEMENT_11 "ãã¬ãã ã¿ã¤ãã«" - IDS_ELEMENT_12 "ã·ã³ãã« ã¿ã¤ãã«" - IDS_ELEMENT_13 "ãã£ãã·ã§ã³ ãã¼" - IDS_ELEMENT_14 "éã¢ã¯ãã£ã ã¡ãã¥ã¼é ç®" - IDS_ELEMENT_15 "ãã¤ã¢ãã°" - IDS_ELEMENT_16 "ã¹ã¯ãã¼ã« ãã¼ ã³ã³ããã¼ã«" - IDS_ELEMENT_17 "ã¢ããªã±ã¼ã·ã§ã³ã®èæ¯" - IDS_ELEMENT_18 "å°ãããã£ãã·ã§ã³ãã¼" - IDS_ELEMENT_19 "ã·ã³ãã«ã®éé (æ¨ª)" - IDS_ELEMENT_20 "ã·ã³ãã«ã®éé (ç¸¦)" - IDS_ELEMENT_21 "ã¯ã¤ãã¯æå ±" - IDS_ELEMENT_22 "ã·ã³ãã«" + IDS_ELEMENT_0 "ãã¹ã¯ããã" + IDS_ELEMENT_1 "éã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ã¿ã¤ãã«" + IDS_ELEMENT_2 "éã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ç¸" + IDS_ELEMENT_3 "ã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ã¿ã¤ãã«" + IDS_ELEMENT_4 "ã¢ã¯ãã£ã ã¦ã£ã³ãã¦ã®ç¸" + IDS_ELEMENT_5 "ã¡ãã¥ã¼" + IDS_ELEMENT_6 "é¸æãããé ç®" + IDS_ELEMENT_7 "ã¦ã£ã³ãã¦" + IDS_ELEMENT_8 "ã¹ã¯ãã¼ã« ãã¼" + IDS_ELEMENT_9 "3D ãªãã¸ã§ã¯ã" + IDS_ELEMENT_10 "ãã¬ãã ã¿ã¤ãã«" + IDS_ELEMENT_11 "ãã£ãã·ã§ã³ ãã¼" + IDS_ELEMENT_12 "ãã¤ã¢ãã°" + IDS_ELEMENT_13 "ã¢ããªã±ã¼ã·ã§ã³ã®èæ¯" + IDS_ELEMENT_14 "ã·ã³ãã«ã®éé (æ¨ª)" + IDS_ELEMENT_15 "ã·ã³ãã«ã®éé (ç¸¦)" + IDS_ELEMENT_16 "ã¯ã¤ãã¯æå ±" + IDS_ELEMENT_17 "ã·ã³ãã«" +// IDS_ELEMENT_18 "éã¢ã¯ãã£ã ã¡ãã¥ã¼é ç®" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Bureaublad" - IDS_ELEMENT_2 "Bijschrift niet-actieve vensters" - IDS_ELEMENT_3 "Rand niet-actieve vensters" - IDS_ELEMENT_4 "Bijschrift actieve vensters" - IDS_ELEMENT_5 "Rand actieve vensters" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Oplichtende elementen" - IDS_ELEMENT_8 "Vensters" - IDS_ELEMENT_9 "Schuifbalken" - IDS_ELEMENT_10 "3D objecten" - IDS_ELEMENT_11 "Palettitel" - IDS_ELEMENT_12 "Symbooltitel" - IDS_ELEMENT_13 "Bijschriftbalk" - IDS_ELEMENT_14 "Gedeactiveerde menu elementen" - IDS_ELEMENT_15 "Dialoog" - IDS_ELEMENT_16 "Schuifbalk handvatten" - IDS_ELEMENT_17 "Toepassing achtergrond" - IDS_ELEMENT_18 "Kleine bijschriftbalk" - IDS_ELEMENT_19 "Symbool afstand (horizontaal)" - IDS_ELEMENT_20 "Symbool afstand (verticaal)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbool" + IDS_ELEMENT_0 "Bureaublad" + IDS_ELEMENT_1 "Bijschrift niet-actieve vensters" + IDS_ELEMENT_2 "Rand niet-actieve vensters" + IDS_ELEMENT_3 "Bijschrift actieve vensters" + IDS_ELEMENT_4 "Rand actieve vensters" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Oplichtende elementen" + IDS_ELEMENT_7 "Vensters" + IDS_ELEMENT_8 "Schuifbalken" + IDS_ELEMENT_9 "3D objecten" + IDS_ELEMENT_10 "Palettitel" + IDS_ELEMENT_11 "Bijschriftbalk" + IDS_ELEMENT_12 "Dialoog" + IDS_ELEMENT_13 "Toepassing achtergrond" + IDS_ELEMENT_14 "Symbool afstand (horizontaal)" + IDS_ELEMENT_15 "Symbool afstand (verticaal)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Symbool" +// IDS_ELEMENT_18 "Gedeactiveerde menu elementen" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Skrivebord" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Meny" - IDS_ELEMENT_7 "Valgt enhet" - IDS_ELEMENT_8 "Vindu" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objekter" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Tegn tittel" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deaktivert meny elementer" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Program bakgrunn" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Tegn avstand (horisontalt)" - IDS_ELEMENT_20 "Tegn avstand (vertikalt)" - IDS_ELEMENT_21 "Rask infomasjon" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_0 "Skrivebord" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "Meny" + IDS_ELEMENT_6 "Valgt enhet" + IDS_ELEMENT_7 "Vindu" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objekter" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Program bakgrunn" + IDS_ELEMENT_14 "Tegn avstand (horisontalt)" + IDS_ELEMENT_15 "Tegn avstand (vertikalt)" + IDS_ELEMENT_16 "Rask infomasjon" + IDS_ELEMENT_17 "Symbol" +// IDS_ELEMENT_18 "Deaktivert meny elementer" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -235,28 +235,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Pulpit" - IDS_ELEMENT_2 "Nieaktywny pasek tytuÅu" - IDS_ELEMENT_3 "Obramowanie nieaktywnego okna" - IDS_ELEMENT_4 "Aktywny pasek tytuÅu" - IDS_ELEMENT_5 "Obramowanie aktywnego okna" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Wybrane elementy" - IDS_ELEMENT_8 "Okno" - IDS_ELEMENT_9 "Pasek przewijania" - IDS_ELEMENT_10 "Obiekty 3D" - IDS_ELEMENT_11 "Nazwa palety " - IDS_ELEMENT_12 "Etykieta ikony" - IDS_ELEMENT_13 "Belka tytuÅowa" - IDS_ELEMENT_14 "Nieaktywne elementy menu" - IDS_ELEMENT_15 "Okno komunikatu" - IDS_ELEMENT_16 "Przyciski na pasku przewijania" - IDS_ELEMENT_17 "TÅo aplikacji" - IDS_ELEMENT_18 "MaÅa belka tytuÅowa" - IDS_ELEMENT_19 "Rozmieszczenie ikon (poziome)" - IDS_ELEMENT_20 "Rozmieszczenie ikon (pionowe)" - IDS_ELEMENT_21 "Etykieta narzÄdzia" - IDS_ELEMENT_22 "Ikona" + IDS_ELEMENT_0 "Pulpit" + IDS_ELEMENT_1 "Nieaktywny pasek tytuÅu" + IDS_ELEMENT_2 "Obramowanie nieaktywnego okna" + IDS_ELEMENT_3 "Aktywny pasek tytuÅu" + IDS_ELEMENT_4 "Obramowanie aktywnego okna" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Wybrane elementy" + IDS_ELEMENT_7 "Okno" + IDS_ELEMENT_8 "Pasek przewijania" + IDS_ELEMENT_9 "Obiekty 3D" + IDS_ELEMENT_10 "Nazwa palety " + IDS_ELEMENT_11 "Belka tytuÅowa" + IDS_ELEMENT_12 "Okno komunikatu" + IDS_ELEMENT_13 "TÅo aplikacji" + IDS_ELEMENT_14 "Rozmieszczenie ikon (poziome)" + IDS_ELEMENT_15 "Rozmieszczenie ikon (pionowe)" + IDS_ELEMENT_16 "Etykieta narzÄdzia" + IDS_ELEMENT_17 "Ikona" +// IDS_ELEMENT_18 "Nieaktywne elementy menu" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pt-BR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Ãrea de trabalho" - IDS_ELEMENT_2 "Barra de tÃtulo inativa" - IDS_ELEMENT_3 "Borda de janela inativa" - IDS_ELEMENT_4 "Barra de tÃtulo ativa" - IDS_ELEMENT_5 "Borda de janela ativa" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Itens selecionados" - IDS_ELEMENT_8 "Janela" - IDS_ELEMENT_9 "Barra de rolagem" - IDS_ELEMENT_10 "Objetos 3D" - IDS_ELEMENT_11 "TÃtulo da paleta" - IDS_ELEMENT_12 "RÃ³tulo do Ãcone" - IDS_ELEMENT_13 "Barra de tÃtulo" - IDS_ELEMENT_14 "Item de menu desativado" - IDS_ELEMENT_15 "Caixa de mensagem" - IDS_ELEMENT_16 "Controle da barra de rolagem" - IDS_ELEMENT_17 "Fundo da aplicaÃ§Ã£o" - IDS_ELEMENT_18 "Barra de tÃtulo pequena" - IDS_ELEMENT_19 "EspaÃ§amento de Ãcone (horizontal)" - IDS_ELEMENT_20 "EspaÃ§amento de Ãcone (vertical)" - IDS_ELEMENT_21 "Dica de ferramenta" - IDS_ELEMENT_22 "Ãcone" + IDS_ELEMENT_0 "Ãrea de trabalho" + IDS_ELEMENT_1 "Barra de tÃtulo inativa" + IDS_ELEMENT_2 "Borda de janela inativa" + IDS_ELEMENT_3 "Barra de tÃtulo ativa" + IDS_ELEMENT_4 "Borda de janela ativa" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Itens selecionados" + IDS_ELEMENT_7 "Janela" + IDS_ELEMENT_8 "Barra de rolagem" + IDS_ELEMENT_9 "Objetos 3D" + IDS_ELEMENT_10 "TÃtulo da paleta" + IDS_ELEMENT_11 "Barra de tÃtulo" + IDS_ELEMENT_12 "Caixa de mensagem" + IDS_ELEMENT_13 "Fundo da aplicaÃ§Ã£o" + IDS_ELEMENT_14 "EspaÃ§amento de Ãcone (horizontal)" + IDS_ELEMENT_15 "EspaÃ§amento de Ãcone (vertical)" + IDS_ELEMENT_16 "Dica de ferramenta" + IDS_ELEMENT_17 "Ãcone" +// IDS_ELEMENT_18 "Item de menu desativado" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -231,28 +231,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Fundal" - IDS_ELEMENT_2 "Titlul ferestrelor inactive" - IDS_ELEMENT_3 "Chenarul ferestrelor inactive" - IDS_ELEMENT_4 "Titlul ferestrelor active" - IDS_ELEMENT_5 "Chenarul ferestrelor active" - IDS_ELEMENT_6 "Meniu" - IDS_ELEMENT_7 "Elemente selectate" - IDS_ELEMENT_8 "Ferestre" - IDS_ELEMENT_9 "Bare de defilare" - IDS_ELEMENT_10 "Obiecte 3D" - IDS_ELEMENT_11 "Titlu paletÄ" - IDS_ELEMENT_12 "Titlu simbol" - IDS_ELEMENT_13 "BarÄ de titlu" - IDS_ELEMENT_14 "Elemente meniu dezactivate" - IDS_ELEMENT_15 "FereastrÄ de dialog" - IDS_ELEMENT_16 "Controale barÄ de defilare" - IDS_ELEMENT_17 "Fundal aplicaÈie" - IDS_ELEMENT_18 "BarÄ de defilare micÄ" - IDS_ELEMENT_19 "DistanÈÄ simbol (orizontal)" - IDS_ELEMENT_20 "DistanÈÄ simbol (vertical)" - IDS_ELEMENT_21 "Pont" - IDS_ELEMENT_22 "Simbol" + IDS_ELEMENT_0 "Fundal" + IDS_ELEMENT_1 "Titlul ferestrelor inactive" + IDS_ELEMENT_2 "Chenarul ferestrelor inactive" + IDS_ELEMENT_3 "Titlul ferestrelor active" + IDS_ELEMENT_4 "Chenarul ferestrelor active" + IDS_ELEMENT_5 "Meniu" + IDS_ELEMENT_6 "Elemente selectate" + IDS_ELEMENT_7 "Ferestre" + IDS_ELEMENT_8 "Bare de defilare" + IDS_ELEMENT_9 "Obiecte 3D" + IDS_ELEMENT_10 "Titlu paletÄ" + IDS_ELEMENT_11 "BarÄ de titlu" + IDS_ELEMENT_12 "FereastrÄ de dialog" + IDS_ELEMENT_13 "Fundal aplicaÈie" + IDS_ELEMENT_14 "DistanÈÄ simbol (orizontal)" + IDS_ELEMENT_15 "DistanÈÄ simbol (vertical)" + IDS_ELEMENT_16 "Pont" + IDS_ELEMENT_17 "Simbol" +// IDS_ELEMENT_18 "Elemente meniu dezactivate" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -226,28 +226,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" - IDS_ELEMENT_2 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" - IDS_ELEMENT_3 "ÐÑÐ°Ð½Ð¸ÑÐ° Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" - IDS_ELEMENT_4 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" - IDS_ELEMENT_5 "ÐÑÐ°Ð½Ð¸ÑÐ° Ð°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" - IDS_ELEMENT_6 "ÐÐµÐ½Ñ" - IDS_ELEMENT_7 "ÐÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ" - IDS_ELEMENT_8 "ÐÐºÐ½Ð°" - IDS_ELEMENT_9 "ÐÐ¾Ð»Ð¾ÑÐ° Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" - IDS_ELEMENT_10 "Ð ÐµÐ»ÑÐµÑÐ½ÑÐµ Ð¾Ð±ÑÐµÐºÑÑ" - IDS_ELEMENT_11 "Ð¦Ð²ÐµÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" - IDS_ELEMENT_12 "ÐÐºÐ¾Ð½ÐºÐ° Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" - IDS_ELEMENT_13 "Ð¡ÑÑÐ¾ÐºÐ° Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" - IDS_ELEMENT_14 "ÐÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÐµ Ð¿ÑÐ½ÐºÑÑ Ð¼ÐµÐ½Ñ" - IDS_ELEMENT_15 "ÐÐ¸Ð°Ð»Ð¾Ð³" - IDS_ELEMENT_16 "ÐÐ¾Ð»Ð¾ÑÑ Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" - IDS_ELEMENT_17 "Ð Ð°Ð±Ð¾ÑÐ°Ñ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" - IDS_ELEMENT_18 "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð½ÐµÐ»Ð¸" - IDS_ELEMENT_19 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð³Ð¾Ñ.)" - IDS_ELEMENT_20 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð²ÐµÑÑ.)" - IDS_ELEMENT_21 "ÐÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ°Ñ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ°" - IDS_ELEMENT_22 "ÐÐ½Ð°ÑÐ¾Ðº" + IDS_ELEMENT_0 "Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" + IDS_ELEMENT_1 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" + IDS_ELEMENT_2 "ÐÑÐ°Ð½Ð¸ÑÐ° Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" + IDS_ELEMENT_3 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" + IDS_ELEMENT_4 "ÐÑÐ°Ð½Ð¸ÑÐ° Ð°ÐºÑÐ¸Ð²Ð½ÑÑ Ð¾ÐºÐ¾Ð½" + IDS_ELEMENT_5 "ÐÐµÐ½Ñ" + IDS_ELEMENT_6 "ÐÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÑ" + IDS_ELEMENT_7 "ÐÐºÐ½Ð°" + IDS_ELEMENT_8 "ÐÐ¾Ð»Ð¾ÑÐ° Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" + IDS_ELEMENT_9 "Ð ÐµÐ»ÑÐµÑÐ½ÑÐµ Ð¾Ð±ÑÐµÐºÑÑ" + IDS_ELEMENT_10 "Ð¦Ð²ÐµÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" + IDS_ELEMENT_11 "Ð¡ÑÑÐ¾ÐºÐ° Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" + IDS_ELEMENT_12 "ÐÐ¸Ð°Ð»Ð¾Ð³" + IDS_ELEMENT_13 "Ð Ð°Ð±Ð¾ÑÐ°Ñ Ð¾Ð±Ð»Ð°ÑÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ" + IDS_ELEMENT_14 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð³Ð¾Ñ.)" + IDS_ELEMENT_15 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð²ÐµÑÑ.)" + IDS_ELEMENT_16 "ÐÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ°Ñ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ°" + IDS_ELEMENT_17 "ÐÐ½Ð°ÑÐ¾Ðº" +// IDS_ELEMENT_18 "ÐÐµÐ°ÐºÑÐ¸Ð²Ð½ÑÐµ Ð¿ÑÐ½ÐºÑÑ Ð¼ÐµÐ½Ñ" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "PracovnÃ¡ plocha" - IDS_ELEMENT_2 "ZÃ¡hlavie neaktÃvneho okna" - IDS_ELEMENT_3 "Okraj neaktÃvneho okna" - IDS_ELEMENT_4 "ZÃ¡hlavie aktÃvneho okna" - IDS_ELEMENT_5 "Okraj aktÃvneho okna" - IDS_ELEMENT_6 "Ponuka" - IDS_ELEMENT_7 "VybratÃ© poloÅ¾ky" - IDS_ELEMENT_8 "Okno" - IDS_ELEMENT_9 "PosÃºvaÄ" - IDS_ELEMENT_10 "PriestorovÃ© objekty" - IDS_ELEMENT_11 "NÃ¡zov palety" - IDS_ELEMENT_12 "NÃ¡zov tlaÄidla" - IDS_ELEMENT_13 "OvlÃ¡dacie tlaÄidlÃ¡" // old=LiÅ¡ta znaÄiek - IDS_ELEMENT_14 "NedostupnÃ© poloÅ¾ky ponuky" - IDS_ELEMENT_15 "PolÃÄko s hlÃ¡senÃm" - IDS_ELEMENT_16 "OvlÃ¡danie posÃºvaÄa" - IDS_ELEMENT_17 "Pozadie aplikÃ¡cie" - IDS_ELEMENT_18 "MalÃ© ovlÃ¡dacie tlaÄidlÃ¡" - IDS_ELEMENT_19 "Rozostup ikon (vodorovne)" - IDS_ELEMENT_20 "Rozostup ikon (zvislo)" - IDS_ELEMENT_21 "Popis tlaÄidiel" - IDS_ELEMENT_22 "Ikona" + IDS_ELEMENT_0 "PracovnÃ¡ plocha" + IDS_ELEMENT_1 "ZÃ¡hlavie neaktÃvneho okna" + IDS_ELEMENT_2 "Okraj neaktÃvneho okna" + IDS_ELEMENT_3 "ZÃ¡hlavie aktÃvneho okna" + IDS_ELEMENT_4 "Okraj aktÃvneho okna" + IDS_ELEMENT_5 "Ponuka" + IDS_ELEMENT_6 "VybratÃ© poloÅ¾ky" + IDS_ELEMENT_7 "Okno" + IDS_ELEMENT_8 "PosÃºvaÄ" + IDS_ELEMENT_9 "PriestorovÃ© objekty" + IDS_ELEMENT_10 "NÃ¡zov palety" + IDS_ELEMENT_11 "OvlÃ¡dacie tlaÄidlÃ¡" // old=LiÅ¡ta znaÄiek + IDS_ELEMENT_12 "PolÃÄko s hlÃ¡senÃm" + IDS_ELEMENT_13 "Pozadie aplikÃ¡cie" + IDS_ELEMENT_14 "Rozostup ikon (vodorovne)" + IDS_ELEMENT_15 "Rozostup ikon (zvislo)" + IDS_ELEMENT_16 "Popis tlaÄidiel" + IDS_ELEMENT_17 "Ikona" +// IDS_ELEMENT_18 "NedostupnÃ© poloÅ¾ky ponuky" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -230,28 +230,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Titull i dritares inaktive" - IDS_ELEMENT_3 "Skaj i dritares inaktive" - IDS_ELEMENT_4 "Titull i dritares aktive" - IDS_ELEMENT_5 "Skaj i dritares aktive" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Artikuj tÃ« pÃ«rzgjedhur" - IDS_ELEMENT_8 "Dritare" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objekte" - IDS_ELEMENT_11 "Palette titulli" - IDS_ELEMENT_12 "Titulli Symboli" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Elementet Ã§aktivizuar menu" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Kontrolli Scrollbar" - IDS_ELEMENT_17 "Sfondi Aplikacioneve" - IDS_ELEMENT_18 "Captionbar vogel" - IDS_ELEMENT_19 "Simboli distanca (horizontale)" - IDS_ELEMENT_20 "Simboli distanca (vertikale)" - IDS_ELEMENT_21 "Info e shpejt" - IDS_ELEMENT_22 "Simboli" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Titull i dritares inaktive" + IDS_ELEMENT_2 "Skaj i dritares inaktive" + IDS_ELEMENT_3 "Titull i dritares aktive" + IDS_ELEMENT_4 "Skaj i dritares aktive" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Artikuj tÃ« pÃ«rzgjedhur" + IDS_ELEMENT_7 "Dritare" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objekte" + IDS_ELEMENT_10 "Palette titulli" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Sfondi Aplikacioneve" + IDS_ELEMENT_14 "Simboli distanca (horizontale)" + IDS_ELEMENT_15 "Simboli distanca (vertikale)" + IDS_ELEMENT_16 "Info e shpejt" + IDS_ELEMENT_17 "Simboli" +// IDS_ELEMENT_18 "Elementet Ã§aktivizuar menu" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Desktop" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" - IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" - IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Selected Items" + IDS_ELEMENT_7 "Windows" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objects" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Application background" + IDS_ELEMENT_14 "Icon distance (horizontal)" + IDS_ELEMENT_15 "Icon distance (vertical)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Icon" +// IDS_ELEMENT_18 "Deactivated menu elements" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "MasaÃ¼stÃ¼" - IDS_ELEMENT_2 "Edilgin Pencere BaÅlÄ±ÄÄ±" - IDS_ELEMENT_3 "Edilgin Pencere KÄ±yÄ±lÄ±ÄÄ±" - IDS_ELEMENT_4 "Etkin Pencere BaÅlÄ±ÄÄ±" - IDS_ELEMENT_5 "Etkin Pencere KÄ±yÄ±lÄ±ÄÄ±" - IDS_ELEMENT_6 "SeÃ§ke" - IDS_ELEMENT_7 "SeÃ§ili ÃÄeler" - IDS_ELEMENT_8 "Pencereler" - IDS_ELEMENT_9 "KaydÄ±rma ÃubuklarÄ±" - IDS_ELEMENT_10 "3D Nesneler" - IDS_ELEMENT_11 "Renklik Etiketi" - IDS_ELEMENT_12 "Simge Etiketi" - IDS_ELEMENT_13 "BaÅlÄ±k ÃubuÄu" - IDS_ELEMENT_14 "Edilgin SeÃ§ke ÃÄeleri" - IDS_ELEMENT_15 "Ä°letiÅim Penceresi" - IDS_ELEMENT_16 "KaydÄ±rma ÃubuÄu Denetimleri" - IDS_ELEMENT_17 "Uygulama Arka PlanÄ±" - IDS_ELEMENT_18 "KÃ¼Ã§Ã¼k BaÅlÄ±k ÃubuÄu" - IDS_ELEMENT_19 "Simge AralÄ±ÄÄ± (Yatay)" - IDS_ELEMENT_20 "Simge AralÄ±ÄÄ± (Dikey)" - IDS_ELEMENT_21 "Ãabuk YardÄ±m" - IDS_ELEMENT_22 "Simge" + IDS_ELEMENT_0 "MasaÃ¼stÃ¼" + IDS_ELEMENT_1 "Edilgin Pencere BaÅlÄ±ÄÄ±" + IDS_ELEMENT_2 "Edilgin Pencere KÄ±yÄ±lÄ±ÄÄ±" + IDS_ELEMENT_3 "Etkin Pencere BaÅlÄ±ÄÄ±" + IDS_ELEMENT_4 "Etkin Pencere KÄ±yÄ±lÄ±ÄÄ±" + IDS_ELEMENT_5 "SeÃ§ke" + IDS_ELEMENT_6 "SeÃ§ili ÃÄeler" + IDS_ELEMENT_7 "Pencereler" + IDS_ELEMENT_8 "KaydÄ±rma ÃubuklarÄ±" + IDS_ELEMENT_9 "3D Nesneler" + IDS_ELEMENT_10 "Renklik Etiketi" + IDS_ELEMENT_11 "BaÅlÄ±k ÃubuÄu" + IDS_ELEMENT_12 "Ä°letiÅim Penceresi" + IDS_ELEMENT_13 "Uygulama Arka PlanÄ±" + IDS_ELEMENT_14 "Simge AralÄ±ÄÄ± (Yatay)" + IDS_ELEMENT_15 "Simge AralÄ±ÄÄ± (Dikey)" + IDS_ELEMENT_16 "Ãabuk YardÄ±m" + IDS_ELEMENT_17 "Simge" +// IDS_ELEMENT_18 "Edilgin SeÃ§ke ÃÄeleri" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -234,28 +234,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "Ð Ð¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ»" - IDS_ELEMENT_2 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" - IDS_ELEMENT_3 "ÐÐµÐ¶Ð° Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" - IDS_ELEMENT_4 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" - IDS_ELEMENT_5 "ÐÐµÐ¶Ð° Ð°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" - IDS_ELEMENT_6 "ÐÐµÐ½Ñ" - IDS_ELEMENT_7 "ÐÐ¸Ð´ÑÐ»ÐµÐ½Ñ Ð¿ÑÐ½ÐºÑÐ¸" - IDS_ELEMENT_8 "ÐÑÐºÐ½Ð°" - IDS_ELEMENT_9 "Ð¡Ð¼ÑÐ³Ð° Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" - IDS_ELEMENT_10 "Ð ÐµÐ»ÑÑÑÐ½Ñ Ð¾Ð±'ÑÐºÑÐ¸" - IDS_ELEMENT_11 "ÐÐ°Ð·Ð²Ð° Ð¿Ð°Ð½ÐµÐ»Ñ" - IDS_ELEMENT_12 "ÐÑÐ´Ð¿Ð¸Ñ Ð·Ð½Ð°ÑÐºÐ°" - IDS_ELEMENT_13 "ÐÐ½Ð¾Ð¿ÐºÐ¸ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð²ÑÐºÐ½Ð¾Ð¼" - IDS_ELEMENT_14 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ñ Ð¿ÑÐ½ÐºÑÐ¸ Ð¼ÐµÐ½Ñ" - IDS_ELEMENT_15 "ÐÑÐºÐ½Ð¾ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ" - IDS_ELEMENT_16 "ÐÐ»ÐµÐ¼ÐµÐ½ÑÐ¸ ÑÐ¿ÑÐ°Ð²Ð»ÑÐ½Ð½Ñ Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" - IDS_ELEMENT_17 "Ð Ð¾Ð±Ð¾ÑÐ° Ð¾Ð±Ð»Ð°ÑÑÑ Ð´Ð¾Ð´Ð°ÑÐºÐ°" - IDS_ELEMENT_18 "ÐÐ½Ð°ÑÐ¾Ðº Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÑ" - IDS_ELEMENT_19 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÑÐ¶ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð³Ð¾Ñ.)" - IDS_ELEMENT_20 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÑÐ¶ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð²ÐµÑÑ.)" - IDS_ELEMENT_21 "ÐÐ¸ÑÐ¸Ð½Ð°ÑÑÐ° Ð¿ÑÐ´ÐºÐ°Ð·ÐºÐ°" - IDS_ELEMENT_22 "ÐÐ½Ð°ÑÐ¾Ðº" + IDS_ELEMENT_0 "Ð Ð¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ»" + IDS_ELEMENT_1 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" + IDS_ELEMENT_2 "ÐÐµÐ¶Ð° Ð½ÐµÐ°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" + IDS_ELEMENT_3 "ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" + IDS_ELEMENT_4 "ÐÐµÐ¶Ð° Ð°ÐºÑÐ¸Ð²Ð½Ð¸Ñ Ð²ÑÐºÐ¾Ð½" + IDS_ELEMENT_5 "ÐÐµÐ½Ñ" + IDS_ELEMENT_6 "ÐÐ¸Ð´ÑÐ»ÐµÐ½Ñ Ð¿ÑÐ½ÐºÑÐ¸" + IDS_ELEMENT_7 "ÐÑÐºÐ½Ð°" + IDS_ELEMENT_8 "Ð¡Ð¼ÑÐ³Ð° Ð¿ÑÐ¾ÐºÑÑÑÐºÐ¸" + IDS_ELEMENT_9 "Ð ÐµÐ»ÑÑÑÐ½Ñ Ð¾Ð±'ÑÐºÑÐ¸" + IDS_ELEMENT_10 "ÐÐ°Ð·Ð²Ð° Ð¿Ð°Ð½ÐµÐ»Ñ" + IDS_ELEMENT_11 "ÐÐ½Ð¾Ð¿ÐºÐ¸ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð²ÑÐºÐ½Ð¾Ð¼" + IDS_ELEMENT_12 "ÐÑÐºÐ½Ð¾ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ" + IDS_ELEMENT_13 "Ð Ð¾Ð±Ð¾ÑÐ° Ð¾Ð±Ð»Ð°ÑÑÑ Ð´Ð¾Ð´Ð°ÑÐºÐ°" + IDS_ELEMENT_14 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÑÐ¶ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð³Ð¾Ñ.)" + IDS_ELEMENT_15 "ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¼ÑÐ¶ Ð·Ð½Ð°ÑÐºÐ°Ð¼Ð¸ (Ð²ÐµÑÑ.)" + IDS_ELEMENT_16 "ÐÐ¸ÑÐ¸Ð½Ð°ÑÑÐ° Ð¿ÑÐ´ÐºÐ°Ð·ÐºÐ°" + IDS_ELEMENT_17 "ÐÐ½Ð°ÑÐ¾Ðº" +// IDS_ELEMENT_18 "ÐÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ñ Ð¿ÑÐ½ÐºÑÐ¸ Ð¼ÐµÐ½Ñ" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -233,28 +233,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "æ¡é¢" - IDS_ELEMENT_2 "éæ´»å¨çªå£æ é¢æ " - IDS_ELEMENT_3 "éæ´»å¨çªå£è¾¹æ¡" - IDS_ELEMENT_4 "æ´»å¨çªå£æ é¢æ " - IDS_ELEMENT_5 "æ´»å¨çªå£è¾¹æ¡" - IDS_ELEMENT_6 "èå" - IDS_ELEMENT_7 "å·²éå®çé¡¹ç®" - IDS_ELEMENT_8 "çªå£" - IDS_ELEMENT_9 "æ»å¨æ¡" - IDS_ELEMENT_10 "ä¸ç»´ç©ä½" - IDS_ELEMENT_11 "è°è²æ¿æ é¢" - IDS_ELEMENT_12 "å¾æ ä¸»é¢" - IDS_ELEMENT_13 "æ é¢æé®" - IDS_ELEMENT_14 "å·²ç¦ç¨çèåé¡¹" - IDS_ELEMENT_15 "æ¶æ¯æ¡" - IDS_ELEMENT_16 "æ»å¨æ¡æé®" - IDS_ELEMENT_17 "åºç¨ç¨åºèæ¯" - IDS_ELEMENT_18 "å°æ é¢æé®" - IDS_ELEMENT_19 "å¾æ é´è·(æ°´å¹³)" - IDS_ELEMENT_20 "å¾æ é´è·(åç´)" - IDS_ELEMENT_21 "å·¥å·æç¤º" - IDS_ELEMENT_22 "å¾æ " + IDS_ELEMENT_0 "æ¡é¢" + IDS_ELEMENT_1 "éæ´»å¨çªå£æ é¢æ " + IDS_ELEMENT_2 "éæ´»å¨çªå£è¾¹æ¡" + IDS_ELEMENT_3 "æ´»å¨çªå£æ é¢æ " + IDS_ELEMENT_4 "æ´»å¨çªå£è¾¹æ¡" + IDS_ELEMENT_5 "èå" + IDS_ELEMENT_6 "å·²éå®çé¡¹ç®" + IDS_ELEMENT_7 "çªå£" + IDS_ELEMENT_8 "æ»å¨æ¡" + IDS_ELEMENT_9 "ä¸ç»´ç©ä½" + IDS_ELEMENT_10 "è°è²æ¿æ é¢" + IDS_ELEMENT_11 "æ é¢æé®" + IDS_ELEMENT_12 "æ¶æ¯æ¡" + IDS_ELEMENT_13 "åºç¨ç¨åºèæ¯" + IDS_ELEMENT_14 "å¾æ é´è·(æ°´å¹³)" + IDS_ELEMENT_15 "å¾æ é´è·(åç´)" + IDS_ELEMENT_16 "å·¥å·æç¤º" + IDS_ELEMENT_17 "å¾æ " +// IDS_ELEMENT_18 "å·²ç¦ç¨çèåé¡¹" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-TW.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] Sun May 29 00:57:31 2016 @@ -228,28 +228,25 @@ STRINGTABLE BEGIN - IDS_ELEMENT_1 "æ¡é¢" - IDS_ELEMENT_2 "éæ´»åè¦çªæ¨é¡æ¬" - IDS_ELEMENT_3 "éæ´»åè¦çªéæ¡" - IDS_ELEMENT_4 "æ´»åè¦çªæ¨é¡æ¬" - IDS_ELEMENT_5 "æ´»åè¦çªéæ¡" - IDS_ELEMENT_6 "é¸å®" - IDS_ELEMENT_7 "å·²é¸å®çé ç®" - IDS_ELEMENT_8 "è¦çª" - IDS_ELEMENT_9 "æ»¾åæ¢" - IDS_ELEMENT_10 "ä¸ç¶ç©é«" - IDS_ELEMENT_11 "èª¿è²ç¤æ¨é¡" - IDS_ELEMENT_12 "åç¤ºä¸»é¡" - IDS_ELEMENT_13 "æ¨é¡æé" - IDS_ELEMENT_14 "å·²ç¦ç¨çé¸å®é " - IDS_ELEMENT_15 "è¨æ¯æ¡" - IDS_ELEMENT_16 "æ»¾åæ¢æé" - IDS_ELEMENT_17 "æç¨ç¨å¼èæ¯" - IDS_ELEMENT_18 "å°æ¨é¡æé" - IDS_ELEMENT_19 "åç¤ºéè·(æ°´å¹³)" - IDS_ELEMENT_20 "åç¤ºéè·(åç´)" - IDS_ELEMENT_21 "å·¥å·æç¤º" - IDS_ELEMENT_22 "åç¤º" + IDS_ELEMENT_0 "æ¡é¢" + IDS_ELEMENT_1 "éæ´»åè¦çªæ¨é¡æ¬" + IDS_ELEMENT_2 "éæ´»åè¦çªéæ¡" + IDS_ELEMENT_3 "æ´»åè¦çªæ¨é¡æ¬" + IDS_ELEMENT_4 "æ´»åè¦çªéæ¡" + IDS_ELEMENT_5 "é¸å®" + IDS_ELEMENT_6 "å·²é¸å®çé ç®" + IDS_ELEMENT_7 "è¦çª" + IDS_ELEMENT_8 "æ»¾åæ¢" + IDS_ELEMENT_9 "ä¸ç¶ç©é«" + IDS_ELEMENT_10 "èª¿è²ç¤æ¨é¡" + IDS_ELEMENT_11 "æ¨é¡æé" + IDS_ELEMENT_12 "è¨æ¯æ¡" + IDS_ELEMENT_13 "æç¨ç¨å¼èæ¯" + IDS_ELEMENT_14 "åç¤ºéè·(æ°´å¹³)" + IDS_ELEMENT_15 "åç¤ºéè·(åç´)" + IDS_ELEMENT_16 "å·¥å·æç¤º" + IDS_ELEMENT_17 "åç¤º" +// IDS_ELEMENT_18 "å·²ç¦ç¨çé¸å®é " END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun May 29 00:57:31 2016 @@ -147,12 +147,7 @@ #define IDS_ELEMENT_15 3215 #define IDS_ELEMENT_16 3216 #define IDS_ELEMENT_17 3217 -#define IDS_ELEMENT_18 3218 -#define IDS_ELEMENT_19 3219 -#define IDS_ELEMENT_20 3220 -#define IDS_ELEMENT_21 3221 -#define IDS_ELEMENT_22 3222 -#define IDS_ELEMENT_23 3223 +// #define IDS_ELEMENT_18 3218 #define IDS_MULTIPLEMONITORS 3300 #define IDS_UNKNOWNMONITOR 3301

8 years, 7 months

[ekohl] 71451: [MSPAINT] Update russian translation Patch by BinaryTree CORE-10740 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat May 28 22:40:34 2016 New Revision: 71451 URL: http://svn.reactos.org/svn/reactos?rev=71451&view=rev Log: [MSPAINT] Update russian translation Patch by BinaryTree CORE-10740 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] Sat May 28 22:40:34 2016 @@ -210,5 +210,5 @@ IDS_PERCENTAGE, "ÐÑÐ¾ÑÐµÐ½Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð² Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ðµ Ð¾Ñ 1 Ð´Ð¾ 500." IDS_ANGLE, "Ð£Ð³Ð¾Ð» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð² Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ðµ Ð¾Ñ -89 Ð´Ð¾ 89." IDS_LOADERRORTEXT, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ°Ð¹Ð» %s." - IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" -END + IDS_ENLARGEPROMPTTEXT "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð² Ð±ÑÑÐµÑÐµ Ð¾Ð±Ð¼ÐµÐ½Ð° Ð±Ð¾Ð»ÑÑÐµ ÑÐ°ÑÑÑÐ¾Ð²Ð¾Ð³Ð¾ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ.\nÐ¥Ð¾ÑÐ¸ÑÐµ ÑÐ²ÐµÐ»Ð¸ÑÐ¸ÑÑ ÑÐ¾ÑÐµÑÐ½ÑÐ¹ ÑÐ¸ÑÑÐ½Ð¾Ðº?" +END

8 years, 7 months

[hbelusca] 71450: [DESK.CPL] - Fix french translation; - Whitespace fix.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 28 22:05:48 2016 New Revision: 71450 URL: http://svn.reactos.org/svn/reactos?rev=71450&view=rev Log: [DESK.CPL] - Fix french translation; - Whitespace fix. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Sat May 28 22:05:48 2016 @@ -24,30 +24,32 @@ /* This const assigns the color and metric numbers to the elements from the elements list */ -/* Size 1 (width) Size 2 (height) Color 1 Color 2 Font Fontcolor */ +/* Size 1 (width) Size 2 (height) Color 1 Color 2 Font Fontcolor */ const ASSIGNMENT g_Assignment[NUM_ELEMENTS] = -{ {-1, -1, COLOR_DESKTOP, -1, -1, -1}, /* -Desktop */ - {SIZE_CAPTION_HEIGHT, -1, COLOR_INACTIVECAPTION, COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, -1}, /* inactive window caption */ - {SIZE_BORDER_WIDTH, -1, COLOR_INACTIVEBORDER, -1, -1, -1}, /* inactive window border */ - {SIZE_CAPTION_HEIGHT, -1, COLOR_ACTIVECAPTION, COLOR_GRADIENTACTIVECAPTION, FONT_CAPTION, COLOR_CAPTIONTEXT}, /* -active window caption */ - {SIZE_BORDER_WIDTH, -1, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ - {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ - {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_HIGHLIGHT, -1, -1, COLOR_HIGHLIGHTTEXT},/* marked element */ - {-1, -1, COLOR_WINDOW, -1 /*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */ - {SIZE_SCROLL_WIDTH, SIZE_SCROLL_HEIGHT, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ - {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ - {SIZE_SM_CAPTION_HEIGHT, -1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */ - {-1, -1, -1, -1, -1, -1}, /* symbol caption FIXME: Access? */ - {SIZE_CAPTION_HEIGHT, -1, -1, -1, -1, -1}, /* caption bar */ - {-1, -1, -1, -1, -1, COLOR_GRAYTEXT}, /* inactive menu item FIXME: Access? */ - {-1, -1, -1, -1, FONT_MESSAGE, COLOR_WINDOWTEXT}, /* dialog */ - {-1, -1, -1, -1, -1, -1}, /* scrollbar controls FIXME: Access? */ - {-1, -1, COLOR_APPWORKSPACE, -1, -1, -1}, /* application background */ - {-1, -1, -1, -1, -1, -1}, /* small caption bar FIXME: Access? */ - {SIZE_ICON_SPACE_X, -1, -1, -1, -1, -1}, /* symbol distance horiz. */ - {SIZE_ICON_SPACE_Y, -1, -1, -1, -1, -1}, /* symbol distance vert. */ - {-1, -1, COLOR_INFOBK, -1, FONT_STATUS, COLOR_INFOTEXT}, /* quickinfo */ - {SIZE_ICON, -1, -1, -1, FONT_ICON, -1}}; /* symbol */ +{ + {-1, -1, COLOR_DESKTOP, -1, -1, -1}, /* Desktop */ + {SIZE_CAPTION_HEIGHT, -1, COLOR_INACTIVECAPTION, COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, -1}, /* inactive window caption */ + {SIZE_BORDER_WIDTH, -1, COLOR_INACTIVEBORDER, -1, -1, -1}, /* inactive window border */ + {SIZE_CAPTION_HEIGHT, -1, COLOR_ACTIVECAPTION, COLOR_GRADIENTACTIVECAPTION, FONT_CAPTION, COLOR_CAPTIONTEXT}, /* active window caption */ + {SIZE_BORDER_WIDTH, -1, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ + {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ + {SIZE_MENU_HEIGHT, SIZE_MENU_WIDTH, COLOR_HIGHLIGHT, -1, -1, COLOR_HIGHLIGHTTEXT},/* marked element */ + {-1, -1, COLOR_WINDOW, -1 /*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */ + {SIZE_SCROLL_WIDTH, SIZE_SCROLL_HEIGHT, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ + {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ + {SIZE_SM_CAPTION_HEIGHT, -1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */ + {-1, -1, -1, -1, -1, -1}, /* symbol caption -- FIXME: Access? */ + {SIZE_CAPTION_HEIGHT, -1, -1, -1, -1, -1}, /* caption bar */ + {-1, -1, -1, -1, -1, COLOR_GRAYTEXT}, /* inactive menu item -- FIXME: Access? */ + {-1, -1, -1, -1, FONT_MESSAGE, COLOR_WINDOWTEXT}, /* dialog */ + {-1, -1, -1, -1, -1, -1}, /* scrollbar controls -- FIXME: Access? */ + {-1, -1, COLOR_APPWORKSPACE, -1, -1, -1}, /* application background */ + {-1, -1, -1, -1, -1, -1}, /* small caption bar -- FIXME: Access? */ + {SIZE_ICON_SPACE_X, -1, -1, -1, -1, -1}, /* symbol distance horiz. */ + {SIZE_ICON_SPACE_Y, -1, -1, -1, -1, -1}, /* symbol distance vert. */ + {-1, -1, COLOR_INFOBK, -1, FONT_STATUS, COLOR_INFOTEXT}, /* quickinfo */ + {SIZE_ICON, -1, -1, -1, FONT_ICON, -1} /* symbol */ +}; /******************************************************************************/ @@ -357,7 +359,6 @@ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->SchemeAdv); - /* Add the elements to the combo */ for (iElement = 0; iElement < NUM_ELEMENTS; iElement++) { Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sat May 28 22:05:48 2016 @@ -229,7 +229,7 @@ STRINGTABLE BEGIN IDS_ELEMENT_1 "Bureau" - IDS_ELEMENT_2 "Titre de fenÃªtres actives" + IDS_ELEMENT_2 "Titre de fenÃªtres inactives" IDS_ELEMENT_3 "Bord de fenÃªtres inactives" IDS_ELEMENT_4 "Titre de fenÃªtres actives" IDS_ELEMENT_5 "Bord de fenÃªtres actives" @@ -238,7 +238,7 @@ IDS_ELEMENT_8 "FenÃªtres" IDS_ELEMENT_9 "Barres de dÃ©filement" IDS_ELEMENT_10 "Objets 3D " - IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_11 "Titre de palette" IDS_ELEMENT_12 "Titre d'icÃ´ne" IDS_ELEMENT_13 "Barre de titre" IDS_ELEMENT_14 "ÃlÃ©ments de menu dÃ©sactivÃ©s"

8 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016