Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66993: [DESKADP][DESKMON] Add icons. Brought to you by Jared Smudde. CORE-9413

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 22:50:40 2015 New Revision: 66993 URL: http://svn.reactos.org/svn/reactos?rev=66993&view=rev Log: [DESKADP][DESKMON] Add icons. Brought to you by Jared Smudde. CORE-9413 Added: trunk/reactos/dll/shellext/deskadp/resources/ (with props) trunk/reactos/dll/shellext/deskadp/resources/adapter.ico (with props) trunk/reactos/dll/shellext/deskmon/resources/ (with props) trunk/reactos/dll/shellext/deskmon/resources/monitor.ico (with props) Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rc trunk/reactos/dll/shellext/deskadp/lang/bg-BG.rc trunk/reactos/dll/shellext/deskadp/lang/cs-CZ.rc trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/shellext/deskadp/lang/el-GR.rc trunk/reactos/dll/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc trunk/reactos/dll/shellext/deskadp/lang/eu-ES.rc trunk/reactos/dll/shellext/deskadp/lang/fr-FR.rc trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc trunk/reactos/dll/shellext/deskadp/lang/it-IT.rc trunk/reactos/dll/shellext/deskadp/lang/no-NO.rc trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc trunk/reactos/dll/shellext/deskadp/lang/sq-AL.rc trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/shellext/deskadp/resource.h trunk/reactos/dll/shellext/deskmon/deskmon.rc trunk/reactos/dll/shellext/deskmon/lang/bg-BG.rc trunk/reactos/dll/shellext/deskmon/lang/cs-CZ.rc trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/shellext/deskmon/lang/el-GR.rc trunk/reactos/dll/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/shellext/deskmon/lang/es-ES.rc trunk/reactos/dll/shellext/deskmon/lang/eu-ES.rc trunk/reactos/dll/shellext/deskmon/lang/fr-FR.rc trunk/reactos/dll/shellext/deskmon/lang/he-IL.rc trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc trunk/reactos/dll/shellext/deskmon/lang/no-NO.rc trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc trunk/reactos/dll/shellext/deskmon/lang/ru-RU.rc trunk/reactos/dll/shellext/deskmon/lang/sk-SK.rc trunk/reactos/dll/shellext/deskmon/lang/sq-AL.rc trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc trunk/reactos/dll/shellext/deskmon/resource.h Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/deskadp.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/deskadp.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -10,6 +10,8 @@ #include <reactos/version.rc> #include <reactos/manifest_dll.rc> + +IDC_DESK_ADAPTER ICON "resources/adapter.ico" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/shellext/deskadp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/bg-BG.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÐ¸Ð´ ÐºÐ°ÑÑÐ°", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° ÐºÐ°ÑÑÐ°ÑÐ°:", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/cs-CZ.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -11,6 +11,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Typ adaptÃ©ru", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Vlastnosti", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Adaptertyp", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter-Informationen", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/el-GR.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Î¤ÏÏÎ¿Ï ÏÏÎ¿ÏÎ±ÏÎ¼Î¿Î³ÎÎ±", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± ÏÎ¿Î½ ÏÏÎ¿ÏÎ±ÏÎ¼Î¿Î³ÎÎ±", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/en-US.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/es-ES.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -8,6 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipo de adaptador ", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propiedades", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "InformaciÃ³n del adaptador ", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/eu-ES.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Adaptadore mota ", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propietateak", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adaptadorearen informazioa ", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/fr-FR.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Type d'adaptateur", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&PropriÃ©tÃ©s", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informations sur l'adaptateur", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "×¡×× ××ª××", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "×××¤××× ××", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "×¤×¨×× ×××ª××", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/it-IT.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipo di adattatore", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&ProprietÃ ", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informazioni sul'adattatore", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/no-NO.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Korttype", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Egenskaper", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Kortinformasjon", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -14,6 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Typ karty", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&WÅaÅciwoÅci", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informacje o karcie", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/ro-RO.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -14,6 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tip de adaptor", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&ProprietÄÈiâ¦", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Despre adaptor", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ð¢Ð¸Ð¿ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± Ð°Ð´Ð°Ð¿ÑÐµÑÐµ", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -13,6 +13,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Typ adaptÃ©r", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "Vl&astnosti", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "InformÃ¡cie o adaptÃ©ri", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/sq-AL.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -10,6 +10,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipi Adapter", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "Tipare", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Info mbi dapter", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -8,6 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "BaÄdaÅtÄ±rÄ±cÄ± TÃ¼rÃ¼", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&HusÃ»siyetler", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "BaÄdaÅtÄ±rÄ±cÄ± Bilgisi", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -14,6 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ð¢Ð¸Ð¿ Ð°Ð´Ð°Ð¿ÑÐµÑÐ°", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "Ð&Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "ÐÑÐ´Ð¾Ð¼Ð¾ÑÑÑ Ð¿ÑÐ¾ Ð°Ð´Ð°Ð¿ÑÐµÑ", -1, 7, 56, 237, 75 Modified: trunk/reactos/dll/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/resou… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/resource.h [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -11,6 +11,7 @@ #define IDC_ADAPTERSTRING 206 #define IDC_BIOSINFORMATION 207 #define IDC_LISTALLMODES 208 +#define IDC_DESK_ADAPTER 209 #define IDC_ALLVALIDMODES 301 Propchange: trunk/reactos/dll/shellext/deskadp/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 30 22:50:40 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/deskadp/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/deskadp/resources/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/shellext/deskadp/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/shellext/deskadp/resources/adapter.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/resou… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/deskadp/resources/adapter.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/deskmon.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/deskmon.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -10,6 +10,8 @@ #include <reactos/version.rc> #include <reactos/manifest_dll.rc> + +IDC_MONITORICO ICON "resources/monitor.ico" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/shellext/deskmon/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/bg-BG.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÐ¸Ð´ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/cs-CZ.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -11,6 +11,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Typ monitoru", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Vlastnosti", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,7 +6,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Monitortyp", -1, 7, 3, 237, 52 - LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Einstellungen", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED GROUPBOX "Monitoreinstellungen", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 Modified: trunk/reactos/dll/shellext/deskmon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/el-GR.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Î¤ÏÏÎ¿Ï Î¿Î¸ÏÎ½Î·Ï", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Monitor type", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Properties", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/es-ES.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -8,6 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipo de monitor ", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Propiedades", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/eu-ES.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Monitore Mota ", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Propietateak", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/fr-FR.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Type de moniteur", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&PropriÃ©tÃ©s", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/he-IL.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "×¡×× ×¦×", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "×××¤××× ××", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipo di Monitor", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&ProprietÃ ", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/no-NO.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Skjermtype", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Egenskaper", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -14,6 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Typ monitora", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&WÅaÅciwoÅci", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/ro-RO.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -13,6 +13,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipul de ecran", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&ProprietÄÈiâ¦", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ð¢Ð¸Ð¿ Ð¼Ð¾Ð½Ð¸ÑÐ¾ÑÐ°", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/sk-SK.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -6,6 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Typ monitora", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "Vl&astnosti", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/sq-AL.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -10,6 +10,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tipi Monitorit", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "Tipare", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -8,6 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "GÃ¶stergeÃ§ TÃ¼rÃ¼", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&HusÃ»siyetler", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -14,6 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ð¢Ð¸Ð¿ Ð¼Ð¾Ð½ÑÑÐ¾ÑÐ°", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "Ð&Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED Modified: trunk/reactos/dll/shellext/deskmon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/resou… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/resource.h [iso-8859-1] Mon Mar 30 22:50:40 2015 @@ -9,6 +9,7 @@ #define IDS_REFRESHRATELABEL 205 #define IDC_REFRESHRATE 206 #define IDC_PRUNINGCHECK 207 +#define IDC_MONITORICO 208 #define IDS_USEDEFFRQUENCY 101 #define IDS_FREQFMT 102 Propchange: trunk/reactos/dll/shellext/deskmon/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Mar 30 22:50:40 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/deskmon/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/deskmon/resources/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/shellext/deskmon/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/shellext/deskmon/resources/monitor.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/resou… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/deskmon/resources/monitor.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

9 years, 8 months

[gadamopoulos] 66992: [BROWSEUI] - CProgressDialog: Allocate big enough buffers needed for the text messages during initialization and don't reallocate them at all. Should stop thrashing the heap w...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 22:50:34 2015 New Revision: 66992 URL: http://svn.reactos.org/svn/reactos?rev=66992&view=rev Log: [BROWSEUI] - CProgressDialog: Allocate big enough buffers needed for the text messages during initialization and don't reallocate them at all. Should stop thrashing the heap while copying a large number of files. CORE-9252 Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp trunk/reactos/dll/win32/browseui/CProgressDialog.h Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgre… ============================================================================== --- trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] Mon Mar 30 22:50:34 2015 @@ -40,51 +40,47 @@ #define ID_3SECONDS 101 +#define BUFFER_SIZE 256 + CProgressDialog::CProgressDialog() { - ULONG cb = 32 *sizeof(WCHAR); - this->lines[0] = (LPWSTR) heap_alloc_zero(cb); - this->lines[1] = (LPWSTR) heap_alloc_zero(cb); - this->lines[2] = (LPWSTR) heap_alloc_zero(cb); - this->cancelMsg = (LPWSTR) heap_alloc_zero(cb); - this->title = (LPWSTR) heap_alloc_zero(cb); + this->lines[0] = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + this->lines[1] = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + this->lines[2] = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + this->cancelMsg = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + this->title = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); + + this->lines[0][0] = this->lines[1][0] = this->lines[2][0] = 0; + this->cancelMsg[0] = this->title[0]; this->clockHand = -1; this->progressClock[29].ullMark = 0ull; this->dwStartTime = GetTickCount(); InitializeCriticalSection(&this->cs); - this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); } CProgressDialog::~CProgressDialog() { if (this->hwnd) this->end_dialog(); - heap_free(this->lines[0]); - heap_free(this->lines[1]); - heap_free(this->lines[2]); - heap_free(this->cancelMsg); - heap_free(this->title); - this->cs.DebugInfo->Spare[0] = 0; + HeapFree(GetProcessHeap(), 0, this->lines[0]); + HeapFree(GetProcessHeap(), 0, this->lines[1]); + HeapFree(GetProcessHeap(), 0, this->lines[2]); + HeapFree(GetProcessHeap(), 0, this->cancelMsg); + HeapFree(GetProcessHeap(), 0, this->title); DeleteCriticalSection(&this->cs); } static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - static const WCHAR empty_string[] = {0}; - ULONG len; - - if (string == NULL) - string = empty_string; - len = (wcslen(string) + 1)*sizeof(WCHAR); - - LPWSTR tmp = (LPWSTR) heap_realloc(*buffer, len); - if (tmp) - *buffer = tmp; - else - len = wcslen(*buffer) + 1; - + if (!string) + { + buffer[0] = 0; + return; + } + + ULONG len = max((wcslen(string) + 1)*sizeof(WCHAR), BUFFER_SIZE); StringCchCopyW(*buffer, len, string); } @@ -95,15 +91,13 @@ HWND hwndParent; }; -static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) +static void load_string(LPWSTR *buffer, HINSTANCE hInstance, UINT uiResourceId) { WCHAR string[256]; - LPWSTR ret; LoadStringW(hInstance, uiResourceId, string, sizeof(string)/sizeof(string[0])); - ret = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (wcslen(string) + 1) * sizeof(WCHAR)); - StrCpyW(ret, string); - return ret; + + set_buffer(buffer, string); } void CProgressDialog::set_progress_marquee() @@ -210,8 +204,7 @@ This->isCancelled = TRUE; if (!This->cancelMsg[0]) { - heap_free(This->cancelMsg); - This->cancelMsg = load_string(_AtlBaseModule.GetResourceInstance(), IDS_CANCELLING); + load_string(&This->cancelMsg, _AtlBaseModule.GetResourceInstance(), IDS_CANCELLING); } This->set_progress_marquee(); @@ -238,7 +231,6 @@ // A guess for time remaining based on the start time and current position DWORD timeLeftI = (DWORD) runDiff * ((double) sizeLeft) / ((double) This->progressClock[This->clockHand].ullMark); - heap_realloc(&This->lines[2], 128); StrFromTimeIntervalW(This->lines[2], 128, timeLeftD * 0.3 + timeLeftI * 0.7 , 2); This->update_dialog( UPDATE_LINE1 << 2 ); } Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgre… ============================================================================== --- trunk/reactos/dll/win32/browseui/CProgressDialog.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CProgressDialog.h [iso-8859-1] Mon Mar 30 22:50:34 2015 @@ -81,21 +81,4 @@ END_COM_MAP() }; -static inline void *heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} -static inline void *heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} -static inline void *heap_realloc(void *mem, size_t size) -{ - return mem ? HeapReAlloc(GetProcessHeap(), 0, mem, size) : heap_alloc(size); -} -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* _PROGRESSDIALOG_H_ */

9 years, 8 months

[akhaldi] 66991: [DESK] Prevent the "More" label from spilling into other areas and adjust another label position. By Jared Smudde. CORE-9413

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 22:36:23 2015 New Revision: 66991 URL: http://svn.reactos.org/svn/reactos?rev=66991&view=rev Log: [DESK] Prevent the "More" label from spilling into other areas and adjust another label position. By Jared Smudde. CORE-9413 Modified: 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/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 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&ÐÐºÑÐ°Ð½", 1820, 3, 107, 70, 9 - LTEXT "<Ð½ÑÐ¼Ð°>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<Ð½ÑÐ¼Ð°>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Ð Ð°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ð½Ð° ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "ÐÐ°Ð»ÐºÐ°", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "ÐÐ¾Ð»ÑÐ¼Ð°", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "ÐÐ¾Ð»ÑÐ¼Ð°", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Ð¦Ð²ÐµÑÐ¾Ð²Ðµ", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -128,11 +128,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Obrazovka", 1820, 3, 107, 70, 9 - LTEXT "<nenÃ>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<nenÃ>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Velikost obrazovky", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "MenÅ¡Ã", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "VÄtÅ¡Ã", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "VÄtÅ¡Ã", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&PoÄet barev", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Anzeige", 1820, 3, 107, 70, 9 - LTEXT "<kein>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<kein>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Bi&ldschirmauflÃ¶sung", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Niedrig", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Hoch", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Hoch", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&FarbqualitÃ¤t", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·", 1820, 3, 107, 70, 9 - LTEXT "<ÎºÎ±Î½ÎÎ½Î±>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<ÎºÎ±Î½ÎÎ½Î±>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&ÎÎ½Î¬Î»ÏÏÎ· Î¿Î¸ÏÎ½Î·Ï", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "ÎÎ¹ÎºÏÏÏÎµÏÎ·", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "ÎÎµÎ³Î±Î»ÏÏÎµÏÎ·", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "ÎÎµÎ³Î±Î»ÏÏÎµÏÎ·", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Î Î¿Î¹ÏÏÎ·ÏÎ± ÏÏÏÎ¼Î±ÏÎ¿Ï", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -121,12 +121,12 @@ LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE - LTEXT "&Display", 1820, 3, 107, 70, 9 - LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "&Display:", 1820, 3, 107, 70, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Screen area", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Less", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "More", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "More", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Colors", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -139,7 +139,7 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 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] Mon Mar 30 22:36:23 2015 @@ -124,11 +124,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "Mostrar", 1820, 3, 107, 70, 9 - LTEXT "<ninguno>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<ninguno>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&ResoluciÃ³n de pantalla ", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Menor", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Mayor", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Mayor", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Profundidad de color ", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -124,7 +124,7 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Affichage", 1820, 3, 107, 70, 9 - LTEXT "<aucun>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<aucun>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&RÃ©solution de l'affichage", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Moins", 1815, 9, 137, 25, 9, NOT WS_GROUP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "×ª×¦×××:", 1820, 3, 107, 70, 9 - LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "×××× ×ª×¦×××:", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "×¤×××ª", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "×××ª×¨", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "×××ª×¨", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "×¦××¢××", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -124,11 +124,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&KÃ©pernyÅ", 1820, 3, 107, 70, 9 - LTEXT "<nincs>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<nincs>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "KÃ©&pmÃ©ret", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Kisebb", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Nagyobb", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Nagyobb", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&SzÃnek", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Tampilan", 1820, 3, 107, 70, 9 - LTEXT "<tidak ada>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<tidak ada>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Area &Layar", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Kurang", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Lebih", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Lebih", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Warna", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Schermo", 1820, 3, 107, 70, 9 - LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Risoluzione dello schermo", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Min", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Max", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Max", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Colori", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "ãã£ã¹ãã¬ã¤(&D):", 1820, 3, 107, 70, 9 - LTEXT "<ãªã>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<ãªã>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "ç»é¢ã®è§£ååº¦(&S)", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "å°", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "å¤§", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "å¤§", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "è²(&C)", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Scherm", 1820, 3, 107, 70, 9 - LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Schermresolutie", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Minder", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Meer", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Meer", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Kleuren", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Skjerm", 1820, 3, 107, 70, 9 - LTEXT "<ingen>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<ingen>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&SkjermomrÃ¥de", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mindre", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "StÃ¸rre", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "StÃ¸rre", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Farger", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -131,11 +131,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Ekran", 1820, 3, 107, 70, 9 - LTEXT "<brak>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<brak>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&RozdzielczoÅÄ ekranu", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mniej", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "WiÄcej", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "WiÄcej", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&IloÅÄ kolorÃ³w", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -127,11 +127,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Dispozitive de afiÈare", 1820, 3, 107, 70, 9 - LTEXT "<nespecificat>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<nespecificat>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "Re&zoluÈie ecran", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "MicÄ", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Mare", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Mare", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "Amplitudine &culoare", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -122,11 +122,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&ÐÐ¸ÑÐ¿Ð»ÐµÐ¹", 1820, 3, 107, 70, 9 - LTEXT "<Ð½ÐµÑ>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<Ð½ÐµÑ>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Ð Ð°Ð·ÑÐµÑÐµÐ½Ð¸Ðµ ÑÐºÑÐ°Ð½Ð°", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Ð¼ÐµÐ½.", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Ð±Ð¾Ð».", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Ð±Ð¾Ð».", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&ÐÐ°ÑÐµÑÑÐ²Ð¾ ÑÐ²ÐµÑÐ¾Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -124,11 +124,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Monitor", 1820, 3, 107, 70, 9 - LTEXT "<Nie je>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<Nie je>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&RozlÃÅ¡enie obrazovky", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "niÅ¾Å¡ie", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "vyÅ¡Å¡ie", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "vyÅ¡Å¡ie", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Farby", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -126,11 +126,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Ekran", 1820, 3, 107, 70, 9 - LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Zona ekranit", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Pak", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "ShumÃ«", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "ShumÃ«", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Ngjyra", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -124,11 +124,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Bild", 1820, 3, 107, 70, 9 - LTEXT "<ingen>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<ingen>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&Bildyta", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "LÃ¤gre", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "HÃ¶gre", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "HÃ¶gre", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&FÃ¤rger", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -124,11 +124,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "GÃ¶rÃ¼ntÃ¼:", 1820, 3, 107, 70, 9 - LTEXT "<Yok>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<Yok>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "G&Ã¶rÃ¼ntÃ¼lÃ¼k AlanÄ±", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Daha Az", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "Daha Ãok", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "Daha Ãok", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Renk", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -130,11 +130,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&ÐÐ¸ÑÐ¿Ð»ÐµÐ¹", 1820, 3, 107, 70, 9 - LTEXT "<Ð½ÐµÐ¼Ð°Ñ>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<Ð½ÐµÐ¼Ð°Ñ>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "&ÐÐ±Ð»Ð°ÑÑÑ ÐµÐºÑÐ°Ð½Ñ", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "ÐÐµÐ½ÑÐµ", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "ÐÑÐ»ÑÑÐµ", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "ÐÑÐ»ÑÑÐµ", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Ð¯ÐºÑÑÑÑ ÐºÐ¾Ð»ÑÐ¾ÑÐ¾Ð¿ÐµÑÐµÐ´Ð°ÑÑ", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP 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] Mon Mar 30 22:36:23 2015 @@ -129,11 +129,11 @@ CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "æ¾ç¤º(&D):", 1820, 3, 107, 70, 9 - LTEXT "<none>", IDC_SETTINGS_DEVICE, 9, 116, 224, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 GROUPBOX "å±å¹åºå(&S)", 1818, 3, 127, 115, 43 CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "å°", 1815, 9, 137, 25, 9, NOT WS_GROUP - LTEXT "å¤§", 1816, 93, 137, 25, 9, NOT WS_GROUP + LTEXT "å¤§", 1816, 93, 137, 20, 9, NOT WS_GROUP LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "é¢è²(&C)", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

9 years, 8 months

[tkreuzer] 66990: [ROSAPPS] Get kitty back to rosapps

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 30 22:33:40 2015 New Revision: 66990 URL: http://svn.reactos.org/svn/reactos?rev=66990&view=rev Log: [ROSAPPS] Get kitty back to rosapps Added: trunk/rosapps/applications/sysutils/tcat/ (props changed) - copied from r66941, trunk/rosapps/applications/sysutils/tcat/ trunk/rosapps/applications/sysutils/utils/cat/ (props changed) - copied from r66941, trunk/rosapps/applications/sysutils/utils/cat/ Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/utils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Mon Mar 30 22:33:40 2015 @@ -12,5 +12,6 @@ #add_subdirectory(rosddt) #add_subdirectory(screenshot) #add_subdirectory(systeminfo) +#add_subdirectory(tcat) add_subdirectory(tlist) add_subdirectory(utils) Propchange: trunk/rosapps/applications/sysutils/tcat/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 30 22:33:40 2015 @@ -0,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/sysutils/tcat/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] Mon Mar 30 22:33:40 2015 @@ -1,4 +1,5 @@ #add_subdirectory(binpatch) +add_subdirectory(cat) #add_subdirectory(driver) #add_subdirectory(infinst) #add_subdirectory(nts2w32err) Propchange: trunk/rosapps/applications/sysutils/utils/cat/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Mar 30 22:33:40 2015 @@ -0,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/sysutils/utils/cat/ ------------------------------------------------------------------------------ svn:mergeinfo =

9 years, 8 months

[tkreuzer] 66989: [CMAKE] Use native OS tools for concatenating files. Remove cat from host tools.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 30 22:31:43 2015 New Revision: 66989 URL: http://svn.reactos.org/svn/reactos?rev=66989&view=rev Log: [CMAKE] Use native OS tools for concatenating files. Remove cat from host tools. Removed: trunk/reactos/tools/cat.c Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66989&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon Mar 30 22:31:43 2015 @@ -85,9 +85,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS bin2c cat widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS bin2c cat widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Mar 30 22:31:43 2015 @@ -504,12 +504,27 @@ endfunction() endif() -macro(concatenate_files _output) - add_custom_command( - OUTPUT ${_output} - COMMAND native-cat ${ARGN} > ${_output} - DEPENDS ${ARGN} native-cat) -endmacro() +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + function(concatenate_files _output _file1) + file(TO_NATIVE_PATH "${_output}" _real_output) + file(TO_NATIVE_PATH "${_file1}" _file_list) + foreach(_file ${ARGN}) + file(TO_NATIVE_PATH "${_file}" _real_file) + set(_file_list "${_file_list} + ${_real_file}") + endforeach() + add_custom_command( + OUTPUT ${_output} + COMMAND cmd.exe /C "copy /Y /B ${_file_list} ${_real_output} > nul" + DEPENDS ${_file1} ${ARGN}) + endfunction() +else() + macro(concatenate_files _output) + add_custom_command( + OUTPUT ${_output} + COMMAND cat ${ARGN} > ${_output} + DEPENDS ${ARGN}) + endmacro() +endif() function(add_importlibs _module) add_dependency_node(${_module}) Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Mon Mar 30 22:31:43 2015 @@ -6,7 +6,6 @@ endif() add_executable(bin2c bin2c.c) -add_executable(cat cat.c) add_executable(gendib gendib/gendib.c) add_executable(geninc geninc/geninc.c) add_executable(mkshelllink mkshelllink/mkshelllink.c) Removed: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66988 ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c (removed) @@ -1,128 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS conCATenation tool - * FILE: tools/cat.c - * PURPOSE: Concatenates STDIN or an arbitrary number of files to STDOUT - * PROGRAMMERS: David Welch - * Semyon Novikov (tappak) - * Hermès Bélusca - Maïto - */ - -#include <stdio.h> - -#ifdef _WIN32 -#include <fcntl.h> -#else -#define O_TEXT 0x4000 -#define O_BINARY 0x8000 -#define setmode(fd, mode) // This function is useless in *nix world. -#define stricmp strcasecmp -#endif - -#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) - -void help(void) -{ - fprintf(stdout, - "\n" - "ReactOS File Concatenation Tool\n" - "\n" - "Usage: cat [options] [file [...]]\n" - "options - Currently ignored\n"); -} - -int main(int argc, char* argv[]) -{ - int i; - FILE* in; - unsigned char buff[512]; - size_t cnt, readcnt; - - if (argc >= 2) - { - if (stricmp(argv[1], "-h" ) == 0 || - stricmp(argv[1], "--help") == 0 || - stricmp(argv[1], "/?" ) == 0 || - stricmp(argv[1], "/help" ) == 0) - { - help(); - return 0; - } - } - - /* Set STDOUT to binary */ - setmode(fileno(stdout), O_BINARY); - - /* Special case where we run 'cat' without any argument: we use STDIN */ - if (argc <= 1) - { - unsigned int ch; - - /* Set STDIN to binary */ - setmode(fileno(stdin), O_BINARY); - -#if 0 // Version using feof() - ch = fgetc(stdin); - while (!feof(stdin)) - { - putchar(ch); - ch = fgetc(stdin); - } -#else - while ((ch = fgetc(stdin)) != EOF) - { - putchar(ch); - } -#endif - - return 0; - } - - /* We have files: read them and output them to STDOUT */ - for (i = 1; i < argc; i++) - { - /* Open the file in binary read mode */ - in = fopen(argv[i], "rb"); - if (in == NULL) - { - fprintf(stderr, "Failed to open file '%s'\n", argv[i]); - return -1; - } - - /* Dump the file to STDOUT */ - cnt = 0; readcnt = 0; - while (readcnt == cnt) - { - /* Read data from the input file */ - cnt = ARRAYSIZE(buff); - readcnt = fread(&buff, sizeof(buff[0]), cnt, in); - if (readcnt != cnt) - { - /* - * The real number of read bytes differs from the number of bytes - * we wanted to read, so either a reading error occurred, or EOF - * was reached while reading. Bail out if it is a reading error. - */ - if (!feof(in)) - { - fprintf(stderr, "Error while reading file '%s'\n", argv[i]); - fclose(in); - return -1; - } - } - - /* Nothing to be read anymore, so we can gracefully break */ - if (readcnt == 0) break; - - /* Write data to STDOUT */ - fwrite(&buff, sizeof(buff[0]), readcnt, stdout); - } - - /* Finally close the file */ - fclose(in); - } - - return 0; -} - -/* EOF */

9 years, 8 months

[gadamopoulos] 66988: [EXPLORER] - Fix showing the website when Help is selected from the start menu.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 30 22:28:08 2015 New Revision: 66988 URL: http://svn.reactos.org/svn/reactos?rev=66988&view=rev Log: [EXPLORER] - Fix showing the website when Help is selected from the start menu. Modified: trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Mon Mar 30 22:28:08 2015 @@ -28,7 +28,7 @@ STRINGTABLE BEGIN //IDS_HELP_COMMAND "helpctr.exe>-FromStartHelp" - IDS_HELP_COMMAND "https://www.reactos.org/" + IDS_HELP_COMMAND "http://www.reactos.org/" END IDA_TASKBAR ACCELERATORS Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Mon Mar 30 22:28:08 2015 @@ -2653,13 +2653,13 @@ } pszParameters = wcschr(szCommand, L'>'); - if (!pszParameters) - return E_FAIL; - - *pszParameters = 0; - pszParameters++; - - ShellExecuteW(m_hWnd, NULL, szCommand, pszParameters, NULL, 0); + if (pszParameters) + { + *pszParameters = 0; + pszParameters++; + } + + ShellExecuteW(m_hWnd, NULL, szCommand, pszParameters, NULL, SW_SHOWNORMAL); return S_OK; }

9 years, 8 months

[akhaldi] 66987: [SHELL32] Disk Check utility: Make the progress bar longer, shrink the group box, align the checkboxes and shrink the oversize box. Brought to you by Jared Smudde. CORE-9449

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 22:13:37 2015 New Revision: 66987 URL: http://svn.reactos.org/svn/reactos?rev=66987&view=rev Log: [SHELL32] Disk Check utility: Make the progress bar longer, shrink the group box, align the checkboxes and shrink the oversize box. Brought to you by Jared Smudde. CORE-9449 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -593,7 +593,7 @@ CAPTION "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð½Ð° Ð´Ð¸ÑÐºÐ°" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "ÐÐ°ÑÐ°Ð»Ð¾", IDOK, 53, 100, 60, 14 + DEFPUSHBUTTON "ÐÐ°ÑÐ°Ð»Ð¾", IDOK, 63, 95, 60, 14 GROUPBOX "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ°ÑÐ°", -1, 7, 6, 229, 50 PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 118, 100, 60, 14 AUTOCHECKBOX "Ð¡Ð°Ð¼Ð¾Ð¿Ð¾Ð¿ÑÐ°Ð²ÑÐ½Ðµ Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð½Ð¸ÑÐµ Ð³ÑÐµÑÐºÐ¸ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ", 14000, 16, 15, 210, 10 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -594,17 +594,17 @@ AUTOCHECKBOX "&Aktivovat kompresi", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Zkontrolovat disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "MoÅ¾nosti kontroly disku", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "MoÅ¾nosti kontroly disku", -1, 7, 6, 179, 40 PUSHBUTTON "Storno", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automaticky opravovat chyby souborovÃ©ho systÃ©mu", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automaticky opravovat chyby souborovÃ©ho systÃ©mu", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Vyhledat a pokusit se obnovit vadnÃ© sektory", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -594,17 +594,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Komprimierung aktivieren", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ÃberprÃ¼fen des DatentrÃ¤gers" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Starten", IDOK, 53, 100, 60, 14 - GROUPBOX "Optionen fÃ¼r die DatentrÃ¤gerprÃ¼fung", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "&Starten", IDOK, 63, 95, 60, 14 + GROUPBOX "Optionen fÃ¼r die DatentrÃ¤gerprÃ¼fung", -1, 7, 6, 179, 40 PUSHBUTTON "S&chlieÃen", IDCANCEL, 118, 100, 60, 14 AUTOCHECKBOX "&Dateisystemfehler automatisch korrigieren", 14000, 16, 15, 165, 10 AUTOCHECKBOX "&Fehlerhafte Sektoren suchen/wiederherstellen", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 0, 7, 60, 179, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 + PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 + AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 12, 30, 165, 10 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -594,7 +594,7 @@ CAPTION "ComprobaciÃ³n de disco" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Iniciar", IDOK, 53, 100, 60, 14 + DEFPUSHBUTTON "Iniciar", IDOK, 63, 95, 60, 14 GROUPBOX "Opciones de comprobaciÃ³n de disco ", -1, 7, 6, 225, 50 PUSHBUTTON "Cancelar", IDCANCEL, 118, 100, 60, 14 AUTOCHECKBOX "Reparar &automÃ¡ticamente errores en el sistema de archivos", 14000, 16, 15, 200, 10 Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "Activer la compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "VÃ©rifier le disque" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "DÃ©marrer", IDOK, 53, 100, 60, 14 - GROUPBOX "Options de vÃ©rification", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "DÃ©marrer", IDOK, 63, 95, 60, 14 + GROUPBOX "Options de vÃ©rification", -1, 7, 6, 179, 40 PUSHBUTTON "Annuler", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "RÃ©parer automatiquement les erreurs du systÃ¨me de fichiers", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "RÃ©parer automatiquement les erreurs du systÃ¨me de fichiers", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scanner pour rechercher et rÃ©parer les secteurs dÃ©fectueux", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "Abilita la &compressione", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Inizia", IDOK, 53, 100, 60, 14 - GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Inizia", IDOK, 63, 95, 60, 14 + GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 40 PUSHBUTTON "Annulla", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Cerca i settori difettosi e tenta di correggerli", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "å§ç¸®ãæå¹ã«ãã(&E)", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ãã§ãã¯ãã£ã¹ã¯" FONT 9, "MS UI Gothic" BEGIN - DEFPUSHBUTTON "éå§", IDOK, 53, 100, 60, 14 - GROUPBOX "ãã§ãã¯ãã£ã¹ã¯ãªãã·ã§ã³", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "éå§", IDOK, 63, 95, 60, 14 + GROUPBOX "ãã§ãã¯ãã£ã¹ã¯ãªãã·ã§ã³", -1, 7, 6, 179, 40 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "èªåçã«ãã¡ã¤ã«ã·ã¹ãã ã®ã¨ã©ã¼ãä¿®å¾©ãã", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "èªåçã«ãã¡ã¤ã«ã·ã¹ãã ã®ã¨ã©ã¼ãä¿®å¾©ãã", 14000, 12, 15, 155, 10 AUTOCHECKBOX "ãããã»ã¯ã¿ãã¹ãã£ã³ãåå¾©ãè©¦ã¿ã(&S)", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&UtfÃ¸r komprimering", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Kontroller disken" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Alternativer for diskkontroll", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Alternativer for diskkontroll", -1, 7, 6, 179, 40 PUSHBUTTON "Avbryt", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Reparer feil i filsysten automatisk", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Reparer feil i filsysten automatisk", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&SÃ¸k etter og forsÃ¸k Ã¥ reparere skadet sektorer", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&WÅÄcz kompresjÄ", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Sprawdzanie dyskÃ³w" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Opcje sprawdzania dyskÃ³w", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Opcje sprawdzania dyskÃ³w", -1, 7, 6, 179, 40 PUSHBUTTON "Anuluj", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatycznie naprawiaj bÅÄdy systemu plikÃ³w", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatycznie naprawiaj bÅÄdy systemu plikÃ³w", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Szukaj i prÃ³buj odzyskaÄ uszkodzone sektory", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Habilitar CompressÃ£o", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Verificar Disco" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Iniciar", IDOK, 53, 100, 60, 14 - GROUPBOX "OpÃ§Ãµes de verificaÃ§Ã£o de disco", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Iniciar", IDOK, 63, 95, 60, 14 + GROUPBOX "OpÃ§Ãµes de verificaÃ§Ã£o de disco", -1, 7, 6, 179, 40 PUSHBUTTON "Cancelar", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Corrigir erros do sistema automaticamente", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Corrigir erros do sistema automaticamente", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Realizar varredura e tentar recuperar bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Permitir CompressÃ£o", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Verificar Disco" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Iniciar", IDOK, 53, 100, 60, 14 - GROUPBOX "OpÃ§Ãµes verificaÃ§Ã£o do disco", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Iniciar", IDOK, 63, 95, 60, 14 + GROUPBOX "OpÃ§Ãµes verificaÃ§Ã£o do disco", -1, 7, 6, 179, 40 PUSHBUTTON "Cancelar", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Reparar automÃ¡ticamente erros nos ficheiros do sistema", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Reparar automÃ¡ticamente erros nos ficheiros do sistema", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Procurar e tentar reparar sectores danificados", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -590,17 +590,17 @@ AUTOCHECKBOX "Co&mpresie", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Verificare unitate de stocare" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&PorneÈte", IDOK, 53, 100, 60, 14 - GROUPBOX "OpÈiuni de verificare", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "&PorneÈte", IDOK, 63, 95, 60, 14 + GROUPBOX "OpÈiuni de verificare", -1, 7, 6, 179, 40 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "&ReparÄ erorile Ã®n mod automat", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "&ReparÄ erorile Ã®n mod automat", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&AnalizeazÄ Èi reparÄ Ã®nregistrÄrile eronate", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "Z&apnÃºÅ¥ kompresiu", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Kontrola disku" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&SpustiÅ¥", IDOK, 53, 100, 60, 14 - GROUPBOX "MoÅ¾nosti kontroly disku", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "&SpustiÅ¥", IDOK, 63, 95, 60, 14 + GROUPBOX "MoÅ¾nosti kontroly disku", -1, 7, 6, 179, 40 PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 118, 100, 60, 14 AUTOCHECKBOX "&Automaticky opraviÅ¥ chyby v systÃ©me sÃºborov", 14000, 16, 15, 165, 10 AUTOCHECKBOX "Vy&hÄ¾adaÅ¥ a pokÃºsiÅ¥ sa obnoviÅ¥ chybnÃ© sektory", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -592,17 +592,17 @@ AUTOCHECKBOX "MundÃ«so Kompresimin", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Kontrollo Diskun" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Fillo", IDOK, 53, 100, 60, 14 - GROUPBOX "Opsione kontrollo diskun", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Fillo", IDOK, 63, 95, 60, 14 + GROUPBOX "Opsione kontrollo diskun", -1, 7, 6, 179, 40 PUSHBUTTON "Anulo", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Rregullo dokumentet e sistemit automatikisht", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Rregullo dokumentet e sistemit automatikisht", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Skano pÃ«r shÃ«rim dhe pÃ«rpjekje tÃ« sektorÃ«ve tÃ« kÃ«qij", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "SÄ±kÄ±ÅtÄ±rmayÄ± &EtkinleÅtir", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Disk Denetle" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&BaÅlat", IDOK, 53, 100, 60, 14 - GROUPBOX "Disk denetimi seÃ§enekleri", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "&BaÅlat", IDOK, 63, 95, 60, 14 + GROUPBOX "Disk denetimi seÃ§enekleri", -1, 7, 6, 179, 40 PUSHBUTTON "Ä°ptal", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "&Dosya sistemi hatalarÄ±nÄ± otomatik olarak dÃ¼zelt", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "&Dosya sistemi hatalarÄ±nÄ± otomatik olarak dÃ¼zelt", 14000, 12, 15, 155, 10 AUTOCHECKBOX "B&ozuk bÃ¶lÃ¼mleri tarayÄ±p dÃ¼zeltmeye Ã§alÄ±Å", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -588,17 +588,17 @@ AUTOCHECKBOX "&ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ ÑÑÐ¸ÑÐºÐ°Ð½Ð½Ñ", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ÐÐµÑÐµÐ²ÑÑÐºÐ° Ð´Ð¸ÑÐºÑ" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "ÐÐ¾ÑÐ°ÑÐ¸", IDOK, 53, 100, 60, 14 - GROUPBOX "ÐÐ¿ÑÑÑ Ð¿ÐµÑÐµÐ²ÑÑÐºÐ¸ Ð´Ð¸ÑÐºÑ", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "ÐÐ¾ÑÐ°ÑÐ¸", IDOK, 63, 95, 60, 14 + GROUPBOX "ÐÐ¿ÑÑÑ Ð¿ÐµÑÐµÐ²ÑÑÐºÐ¸ Ð´Ð¸ÑÐºÑ", -1, 7, 6, 179, 40 PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 118, 100, 60, 14 AUTOCHECKBOX "ÐÐ¸Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸", 14000, 16, 15, 165, 10 AUTOCHECKBOX "&Ð¡Ð¿ÑÐ¾Ð±ÑÐ²Ð°ÑÐ¸ Ð²ÑÐ´Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð³Ð°Ð½Ñ ÑÐµÐºÑÐ¾ÑÐ¸", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -597,17 +597,17 @@ AUTOCHECKBOX "å¯ç¨åç¼©(&E)", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Mar 30 22:13:37 2015 @@ -596,17 +596,17 @@ AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 120 +IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "æª¢æ¥ç£ç¢" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 + DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 + GROUPBOX "Check disk options", -1, 7, 6, 179, 40 PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END

9 years, 8 months

[akhaldi] 66986: [MLANG_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 21:45:29 2015 New Revision: 66986 URL: http://svn.reactos.org/svn/reactos?rev=66986&view=rev Log: [MLANG_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/mlang/mlang.c Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… ============================================================================== --- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Mon Mar 30 21:45:29 2015 @@ -487,15 +487,15 @@ ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); n = 65536; ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n); + ok(ret == S_FALSE || ret == E_FAIL, + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); if (ret == S_FALSE) - ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + ok(n == 0, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); else if (ret == E_FAIL) - ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(n == 65536, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL); - if (ret == S_FALSE) - ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); - else if (ret == E_FAIL) - ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(ret == S_FALSE || ret == E_FAIL, + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2); @@ -694,6 +694,17 @@ HeapFree(GetProcessHeap(), 0, cpinfo); IEnumCodePage_Release(iEnumCP); +} + +static void test_GetCharsetInfo_alias(IMultiLanguage *ml) +{ + WCHAR asciiW[] = {'a','s','c','i','i',0}; + MIMECSETINFO info; + HRESULT hr; + + hr = IMultiLanguage_GetCharsetInfo(ml, asciiW, &info); + ok(hr == S_OK, "got %08x\n", hr); + ok(!lstrcmpW(info.wszCharset, asciiW), "got %s\n", wine_dbgstr_w(info.wszCharset)); } static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) @@ -1973,10 +1984,214 @@ IMLangConvertCharset_Release(convert); } +static const char stream_data[] = "VCARD2.1test;test"; +static ULONG stream_pos; + +static HRESULT WINAPI stream_QueryInterface(IStream *iface, REFIID riid, void **obj) +{ + ok(FALSE, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI stream_AddRef(IStream *iface) +{ + ok(FALSE, "unexpected call\n"); + return 2; +} + +static ULONG WINAPI stream_Release(IStream *iface) +{ + ok(FALSE, "unexpected call\n"); + return 1; +} + +static HRESULT WINAPI stream_Read(IStream *iface, void *buf, ULONG len, ULONG *read) +{ + ULONG size; + + if (stream_pos == sizeof(stream_data) - 1) + { + *read = 0; + return S_FALSE; + } + size = min(sizeof(stream_data) - 1 - stream_pos, len); + memcpy(buf, stream_data + stream_pos, size); + stream_pos += size; + *read = size; + return S_OK; +} + +static HRESULT WINAPI stream_Write(IStream *iface, const void *buf, ULONG len, ULONG *written) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, + ULARGE_INTEGER *newpos) +{ + if (origin == STREAM_SEEK_SET) + stream_pos = move.QuadPart; + else if (origin == STREAM_SEEK_CUR) + stream_pos += move.QuadPart; + else if (origin == STREAM_SEEK_END) + stream_pos = sizeof(stream_data) - 1 - move.QuadPart; + + if (newpos) newpos->QuadPart = stream_pos; + return S_OK; +} + +static HRESULT WINAPI stream_SetSize(IStream *iface, ULARGE_INTEGER newsize) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *stream, ULARGE_INTEGER len, + ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Commit(IStream *iface, DWORD flags) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Revert(IStream *iface) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_LockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER len, DWORD locktype) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, + ULARGE_INTEGER len, DWORD locktype) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Stat(IStream *iface, STATSTG *stg, DWORD flag) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Clone(IStream *iface, IStream **stream) +{ + ok(FALSE, "unexpected call\n"); + return E_NOTIMPL; +} + +static IStreamVtbl stream_vtbl = +{ + stream_QueryInterface, + stream_AddRef, + stream_Release, + stream_Read, + stream_Write, + stream_Seek, + stream_SetSize, + stream_CopyTo, + stream_Commit, + stream_Revert, + stream_LockRegion, + stream_UnlockRegion, + stream_Stat, + stream_Clone +}; + +static IStream test_stream = { &stream_vtbl }; + +static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) +{ + HRESULT hr; + UINT nb_detected, detected[4]; + UINT preferred[] = {1250,1251,1252,65001}; + UINT preferred2[] = {1250,1251,1252}; + + nb_detected = 0; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, + sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + nb_detected = 1; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, + sizeof(preferred)/sizeof(preferred[0]), NULL, &nb_detected, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + nb_detected = 1; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, + sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(nb_detected == 1, "got %u\n", nb_detected); + ok(detected[0] == 65001, "got %u\n", detected[0]); + + nb_detected = 2; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, + sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(nb_detected == 2, "got %u\n", nb_detected); + ok(detected[0] == 65001, "got %u\n", detected[0]); + todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); + + nb_detected = 3; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, + sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); + ok(detected[0] == 65001, "got %u\n", detected[0]); + todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); + todo_wine ok(detected[2] == 1200, "got %u\n", detected[2]); + + nb_detected = 4; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, + sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); + ok(detected[0] == 65001, "got %u\n", detected[0]); + todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); + todo_wine ok(detected[2] == 1200, "got %u\n", detected[2]); + ok(detected[3] == 0, "got %u\n", detected[3]); + + nb_detected = 3; + memset(detected, 0, sizeof(detected)); + hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, + MLDETECTF_PRESERVE_ORDER, &test_stream, preferred2, + sizeof(preferred2)/sizeof(preferred2[0]), detected, &nb_detected, NULL); + ok(hr == S_OK, "got %08x\n", hr); + todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); + ok(detected[0] == 65001, "got %u\n", detected[0]); + todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); + todo_wine ok(detected[2] == 1200, "got %u\n", detected[2]); +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; IMultiLanguage2 *iML2 = NULL; + IMultiLanguage3 *iML3 = NULL; IMLangFontLink *iMLFL = NULL; IMLangFontLink2 *iMLFL2 = NULL; HRESULT ret; @@ -2000,6 +2215,7 @@ test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); test_IMLangConvertCharset(iML); + test_GetCharsetInfo_alias(iML); IMultiLanguage_Release(iML); @@ -2058,5 +2274,14 @@ test_CodePageToScriptID(iMLFL2); IMLangFontLink2_Release(iMLFL2); + trace("IMultiLanguage3\n"); + ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMultiLanguage3, (void **)&iML3); + if (ret == S_OK) + { + test_DetectOutboundCodePageInIStream(iML3); + IMultiLanguage3_Release(iML3); + } + CoUninitialize(); }

9 years, 8 months

[akhaldi] 66985: [MLANG] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 21:45:18 2015 New Revision: 66985 URL: http://svn.reactos.org/svn/reactos?rev=66985&view=rev Log: [MLANG] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/mlang/mlang.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Mon Mar 30 21:45:18 2015 @@ -68,6 +68,7 @@ const char *web_charset; const char *header_charset; const char *body_charset; + const WCHAR *alias; } MIME_CP_INFO; /* These data are based on the codepage info in libs/unicode/cpmap.pl */ @@ -125,7 +126,13 @@ MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, - "gb2312", "gb2312", "gb2312" } + "gb2312", "gb2312", "gb2312" }, + { "Chinese Simplified (GBK)", + 936, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_MINIMAL | + MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | + MIMECONTF_SAVABLE_BROWSER | MIMECONTF_EXPORT | MIMECONTF_VALID_NLS | + MIMECONTF_MIME_IE4 | MIMECONTF_MIME_LATEST, + "gbk", "gbk", "gbk" } }; static const MIME_CP_INFO chinese_traditional_cp[] = { @@ -360,6 +367,9 @@ MIMECONTF_MIME_LATEST, "windows-1258", "windows-1258", "windows-1258" } }; + +static const WCHAR asciiW[] = {'a','s','c','i','i',0}; + static const MIME_CP_INFO western_cp[] = { { "IBM EBCDIC (US-Canada)", @@ -412,7 +422,7 @@ 20127, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, - "us-ascii", "us-ascii", "us-ascii" }, + "us-ascii", "us-ascii", "us-ascii", asciiW }, { "Western European (ISO)", 28591, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | @@ -956,7 +966,7 @@ *pcDstSize = MultiByteToWideChar(dwEncoding, 0, pSrcStr, *pcSrcSize, NULL, 0); break; } - + if (!*pcDstSize) return E_FAIL; @@ -1347,7 +1357,7 @@ IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; - + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); *ppobj = NULL; @@ -2266,7 +2276,7 @@ info->wszLocaleName[0] = 0; GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME); TRACE("ISO639: %s SLANGUAGE: %s\n", wine_dbgstr_w(info->wszRfc1766), wine_dbgstr_w(info->wszLocaleName)); - + data->total++; return TRUE; @@ -2597,6 +2607,13 @@ strcpyW(pCharsetInfo->wszCharset, csetW); return S_OK; } + if (mlang_data[i].mime_cp_info[n].alias && !lstrcmpiW(Charset, mlang_data[i].mime_cp_info[n].alias)) + { + pCharsetInfo->uiCodePage = mlang_data[i].family_codepage; + pCharsetInfo->uiInternetEncoding = mlang_data[i].mime_cp_info[n].cp; + strcpyW(pCharsetInfo->wszCharset, mlang_data[i].mime_cp_info[n].alias); + return S_OK; + } } } @@ -2872,7 +2889,7 @@ * * PARAMS * see ConvertStringToUnicode - * dwFlag + * dwFlag * lpFallBack if dwFlag contains MLCONVCHARF_USEDEFCHAR, lpFallBack string used * instead unconvertible characters. * @@ -3050,10 +3067,17 @@ { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - FIXME("(%p)->(%08x %s %u %p %u %p %p %p)\n", This, dwFlags, debugstr_w(lpWideCharStr), - cchWideChar, puiPreferredCodePages, nPreferredCodePages, puiDetectedCodePages, - pnDetectedCodePages, lpSpecialChar); - return E_NOTIMPL; + FIXME("(%p)->(%08x %s %p %u %p %p(%u) %s)\n", This, dwFlags, debugstr_w(lpWideCharStr), + puiPreferredCodePages, nPreferredCodePages, puiDetectedCodePages, + pnDetectedCodePages, pnDetectedCodePages ? *pnDetectedCodePages : 0, + debugstr_w(lpSpecialChar)); + + if (!puiDetectedCodePages || !pnDetectedCodePages || !*pnDetectedCodePages) + return E_INVALIDARG; + + puiDetectedCodePages[0] = CP_UTF8; + *pnDetectedCodePages = 1; + return S_OK; } static HRESULT WINAPI fnIMultiLanguage3_DetectOutboundCodePageInIStream( @@ -3068,10 +3092,17 @@ { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - FIXME("(%p)->(%08x %p %p %u %p %p %p)\n", This, dwFlags, pStrIn, + FIXME("(%p)->(%08x %p %p %u %p %p(%u) %s)\n", This, dwFlags, pStrIn, puiPreferredCodePages, nPreferredCodePages, puiDetectedCodePages, - pnDetectedCodePages, lpSpecialChar); - return E_NOTIMPL; + pnDetectedCodePages, pnDetectedCodePages ? *pnDetectedCodePages : 0, + debugstr_w(lpSpecialChar)); + + if (!puiDetectedCodePages || !pnDetectedCodePages || !*pnDetectedCodePages) + return E_INVALIDARG; + + puiDetectedCodePages[0] = CP_UTF8; + *pnDetectedCodePages = 1; + return S_OK; } static const IMultiLanguage3Vtbl IMultiLanguage3_vtbl = Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 30 21:45:18 2015 @@ -107,7 +107,7 @@ reactos/dll/win32/mciseq # Synced to WineStaging-1.7.37 reactos/dll/win32/mciwave # Synced to WineStaging-1.7.37 reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 -reactos/dll/win32/mlang # Synced to Wine-1.7.27 +reactos/dll/win32/mlang # Synced to WineStaging-1.7.37 reactos/dll/win32/mmdevapi # Synced to Wine-1.7.27 reactos/dll/win32/mpr # Synced to Wine-1.7.27 reactos/dll/win32/mprapi # Synced to Wine-1.7.27

9 years, 8 months

[akhaldi] 66984: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-9265

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 21:40:50 2015 New Revision: 66984 URL: http://svn.reactos.org/svn/reactos?rev=66984&view=rev Log: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-9265 Added: trunk/reactos/base/system/services/lang/ru-RU.rc (with props) trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/regsvr32/lang/ru-RU.rc trunk/reactos/base/system/services/services.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/browseui/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/audio.inf trunk/reactos/media/inf/battery.inf trunk/reactos/media/inf/bth.inf trunk/reactos/media/inf/c_image.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/disk.inf trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/consrv/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/consrv_new/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -23,12 +23,12 @@ POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN MENUITEM "Ð¡Ð¾Ð·Ð´&Ð°ÑÑ\tCtrl+N", CMD_NEW - MENUITEM "&ÐÑÐºÑÑÑÑ\tCtrl+O", CMD_OPEN + MENUITEM "&ÐÑÐºÑÑÑÑ...\tCtrl+O", CMD_OPEN MENUITEM "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ\tCtrl+S", CMD_SAVE MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &ÐºÐ°Ðº...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "ÐÐ°ÑÐ°&Ð¼ÐµÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ...", CMD_PAGE_SETUP - MENUITEM "&ÐÐµÑÐ°ÑÐ°ÑÑ\tCtrl+P", CMD_PRINT + MENUITEM "&ÐÐµÑÐ°ÑÑ...\tCtrl+P", CMD_PRINT MENUITEM SEPARATOR MENUITEM "Ð&ÑÑÐ¾Ð´", CMD_EXIT END @@ -73,37 +73,37 @@ DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" BEGIN - GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX + GROUPBOX "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 22, 36, 8 + GROUPBOX "ÐÑÐ¼Ð°Ð³Ð°", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "Ð Ð°&Ð·Ð¼ÐµÑ:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 42, 36, 8 + LTEXT "ÐÐ¾Ð´Ð°&ÑÐ°:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 82, 30, 8 + GROUPBOX "ÐÑÐ¸ÐµÐ½ÑÐ°ÑÐ¸Ñ", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&ÐÐ½Ð¸Ð¶Ð½Ð°Ñ", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&ÐÐ»ÑÐ±Ð¾Ð¼Ð½Ð°Ñ", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "ÐÐ¾Ð»Ñ (Ð¼Ð¼)", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&ÐÐµÐ²Ð¾Ðµ:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Right:", stc16, 159, 82, 30, 8 + LTEXT "&ÐÑÐ°Ð²Ð¾Ðµ:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "T&op:", stc17, 88, 102, 30, 8 + LTEXT "&ÐÐµÑÑÐ½ÐµÐµ:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Bottom:", stc18, 159, 102, 30, 8 + LTEXT "&ÐÐ¸Ð¶Ð½ÐµÐµ:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Header:", 0x140, 8, 132, 40, 15 + LTEXT "Ð&ÐµÑÑÐ½Ð¸Ð¹ ÐºÐ¾Ð»Ð¾Ð½ÑÐ¸ÑÑÐ»:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Footer:", 0x142, 8, 149, 40, 15 + LTEXT "Ð&Ð¸Ð¶Ð½Ð¸Ð¹ ÐºÐ¾Ð»Ð¾Ð½ÑÐ¸ÑÑÐ»:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 + PUSHBUTTON "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDHELP, 8, 170, 50, 14 DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "&ÐÐµÑÐ°ÑÑ...", psh3, 310, 170, 50, 14 END /* Dialog 'Encoding' */ @@ -159,7 +159,7 @@ STRING_ERROR "ÐÐ¨ÐÐÐÐ" STRING_WARNING "ÐÐÐÐÐÐÐÐ" STRING_INFO "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" - STRING_UNTITLED "ÐÐµÐ· Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" + STRING_UNTITLED "ÐÐµÐ·ÑÐ¼ÑÐ½Ð½ÑÐ¹" STRING_ALL_FILES "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)" STRING_TEXT_FILES_TXT "Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ (*.txt)" STRING_TOOLARGE "Ð¤Ð°Ð¹Ð» '%s' ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸Ðº.\n\ @@ -176,11 +176,11 @@ STRING_CANNOTFIND "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹ÑÐ¸ '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" - STRING_UNICODE_BE "Unicode (big endian)" + STRING_UNICODE_BE "Unicode (Big Endian)" STRING_UTF8 "UTF-8" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Macintosh (CR)" STRING_LINE_COLUMN "Ð¡ÑÑÐ¾ÐºÐ° %d, ÑÑÐ¾Ð»Ð±ÐµÑ %d" - STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_PRINTERROR "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ°ÑÐ¿ÐµÑÐ°ÑÐ°ÑÑ ÑÐ°Ð¹Ð» '%s'.\n\nÐÑÐ¾Ð²ÐµÑÑÑÐµ, Ð²ÐºÐ»ÑÑÐµÐ½ Ð»Ð¸ Ð¿ÑÐ¸Ð½ÑÐµÑ, Ð¸ Ð½Ð°ÑÑÑÐ¾ÐµÐ½ Ð»Ð¸ Ð¾Ð½ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾." END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -144,6 +144,6 @@ IDS_SUMMARYSUBTITLE "ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_ABORTSETUP "ReactOS ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ. ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°ÐºÑÐ¾ÐµÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÑÐµÐ¹ÑÐ°Ñ, Ð² Ð´Ð°Ð»ÑÐ½ÐµÐ¹ÑÐµÐ¼ Ð²Ð°Ð¼ Ð¿ÑÐ¸Ð´ÐµÑÑÑ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ ReactOS. ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" IDS_ABORTSETUP2 "ÐÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð» 'txtsetup.sif'\nÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾." IDS_CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" END Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -12,7 +12,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -42,8 +42,8 @@ { 0, 0, - " ENTER = à®¤®«¦¨âì F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -58,7 +58,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -118,8 +118,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ R = ®ááâ ®¢«¥¨¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì R = ®ááâ ®¢«¥¨¥ L = ¨æ. á®£« è¥¨¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -134,7 +134,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -212,8 +212,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -228,7 +228,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -276,13 +276,13 @@ { 8, 15, - " ®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¯®áâ ¢«ï¥âáï ¨ ¡¥§ ®£à ¨ç¥¨©", + " ®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¯®áâ ¢«ï¥âáï ¨ ¡¥§", TEXT_STYLE_NORMAL }, { 8, 16, - "¢ ¨á¯®«ì§®¢ ¨¨, ª ª ¢ ¬¥áâ®¬, â ª ¨ ¬¥¦¤ã à®¤®¬ ¯à ¢¥.", + "®£à ¨ç¥¨© ¢ ¨á¯®«ì§®¢ ¨¨, ª ª ¢ ¬¥áâ®¬, â ª ¨ ¬¥¦¤ã à®¤®¬ ¯à ¢¥.", TEXT_STYLE_NORMAL }, { @@ -336,8 +336,8 @@ { 0, 0, - " ENTER = ®§¢à â", - TEXT_TYPE_STATUS + "ENTER = ®§¢à â", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -352,7 +352,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -362,34 +362,34 @@ TEXT_STYLE_NORMAL }, { - 8, + 24, 11, - " ®¬¯ìîâ¥à:", - TEXT_STYLE_NORMAL - }, - { - 8, + "®¬¯ìîâ¥à:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " ªà :", - TEXT_STYLE_NORMAL, - }, - { - 8, + "ªà :", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 13, - " « ¢¨ âãà :", - TEXT_STYLE_NORMAL - }, - { - 8, + "« ¢¨ âãà :", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, - " áª« ¤ª :", - TEXT_STYLE_NORMAL - }, - { - 8, + " áª« ¤ª :", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " à¨¬¥¨âì:", - TEXT_STYLE_NORMAL + "à¨¬¥¨âì:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, @@ -429,8 +429,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -445,7 +445,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -493,8 +493,8 @@ { 0, 0, - " ESC = « ¢ ï áâà ¨æ ENTER = ¥à¥§ £àã§ª ", - TEXT_TYPE_STATUS + "ESC = £« ¢ãî U = ¡®¢«¥¨¥ R = ®ááâ ®¢«¥¨¥ ENTER = ¥à¥§ £àã§ª ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -508,7 +508,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -544,8 +544,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ ESC = â¬¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -560,7 +560,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -584,8 +584,8 @@ { 0, 0, - " ç¨áâª ª¥è ", - TEXT_TYPE_STATUS + "ç¨áâª ª¥è ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -600,7 +600,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -630,8 +630,8 @@ { 0, 0, - " ®¦ «ã©áâ ¯®¤®¦¤¨â¥ ...", - TEXT_TYPE_STATUS, + "®¦ «ã©áâ , ¯®¤®¦¤¨â¥ ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -646,7 +646,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -681,8 +681,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ ESC = â¬¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -697,7 +697,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -727,8 +727,8 @@ { 0, 0, - " ENTER = ¥à¥§ £àã§ª ", - TEXT_TYPE_STATUS + "ENTER = ¥à¥§ £àã§ª ", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -743,7 +743,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -773,8 +773,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -790,7 +790,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -820,14 +820,13 @@ { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 ¦¬¨â¥ C ¤«ï á®§¤ ¨ï ®¢®£® à §¤¥« .", + "\x07 ¦¬¨â¥ P ¤«ï á®§¤ ¨ï ¯¥à¢¨ç®£® à §¤¥« .", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 ¦¬¨â¥ E ¤«ï á®§¤ ¨ï à áè¨à¥®£® à §¤¥« .", TEXT_STYLE_NORMAL }, { @@ -839,8 +838,8 @@ { 0, 0, - " Please wait...", - TEXT_TYPE_STATUS + "®¦ «ã©áâ , ¯®¤®¦¤¨â¥...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -855,7 +854,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -873,8 +872,8 @@ { 0, 0, - " ENTER = à®¤®«¦¥¨¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -889,7 +888,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -925,8 +924,8 @@ { 0, 0, - " ENTER = à®¤®«¦¨âì F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -941,31 +940,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 11, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 0, 12, "®¦ «ã©áâ , ¯®¤®¦¤¨â¥, ¯®ª ¯à®£à ¬¬ ãáâ ®¢ª¨ áª®¯¨àã¥â ä ©«ë", - TEXT_STYLE_NORMAL - }, - { - 11, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "ReactOS ¢ ãáâ ®¢®çãî ¤¨à¥ªâ®à¨î.", - TEXT_STYLE_NORMAL - }, - { - 11, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "â® ¬®¦¥â § ïâì ¥áª®«ìª® ¬¨ãâ.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 ®¦ «ã©áâ ¯®¤®¦¤¨â¥... ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 ®¦ «ã©áâ , ¯®¤®¦¤¨â¥... ", TEXT_TYPE_STATUS }, { @@ -981,7 +980,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1017,8 +1016,8 @@ { 0, 0, - " ENTER = à®¤®«¦¨âì F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1033,7 +1032,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1069,8 +1068,8 @@ { 0, 0, - " ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1085,7 +1084,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1121,8 +1120,8 @@ { 0, 0, - " ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1138,7 +1137,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1150,8 +1149,8 @@ { 0, 0, - " ®¤£®â®¢ª á¯¨áª ª®¯¨àã¥¬ëå ä ©«®¢...", - TEXT_TYPE_STATUS + "®¤£®â®¢ª á¯¨áª ª®¯¨àã¥¬ëå ä ©«®¢...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1167,7 +1166,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1197,8 +1196,8 @@ { 0, 0, - " ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "ENTER = à®¤®«¦¨âì ESC = â¬¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1214,7 +1213,7 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1244,8 +1243,8 @@ { 0, 0, - " D = ¤ «¨âì à §¤¥« ESC = â¬¥ F3 = ëå®¤", - TEXT_TYPE_STATUS + "D = ¤ «¨âì à §¤¥« ESC = â¬¥ F3 = ëå®¤", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1260,7 +1259,7 @@ { 4, 3, - "áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -1272,8 +1271,8 @@ { 0, 0, - " ®§¤ ¨¥ ªãáâ®¢ á¨áâ¥¬®£® à¥¥áâà ...", - TEXT_TYPE_STATUS + "®§¤ ¨¥ ªãáâ®¢ á¨áâ¥¬®£® à¥¥áâà ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1288,7 +1287,7 @@ { { // NOT_AN_ERROR - "Success\n" + "á¯¥è®\n" }, { //ERROR_NOT_INSTALLED @@ -1322,7 +1321,7 @@ }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "¡ àã¦¥ ¥ª®àà¥ªâ ï á¨£ âãà ¢ TXTSETUP.SIF.\n", + "¡ àã¦¥ ¥ª®àà¥ªâ ï ¯®¤¯¨áì ¢ TXTSETUP.SIF.\n", "ENTER = ¥à¥§ £àã§ª " }, { @@ -1481,25 +1480,25 @@ }, { //ERROR_UPDATE_LOCALESETTINGS, - "¥ ã¤ «®áì ãáâ ®¢¨âì «®ª «ì á¨áâ¥¬ë.\n" + "¥ ã¤ «®áì ãáâ ®¢¨âì ï§ëª á¨áâ¥¬ë.\n" "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "¥ ã¤ «®áì ¤®¡ ¢¨âì à áª« ¤ªã ª« ¢¨ âãàë ¢ à¥¥áâà.\n" + "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" - "ENTER = Reboot computer" + "ENTER = ¥à¥§ £àã§ª " }, { //ERROR_INSUFFICIENT_PARTITION_SIZE, "The selected partition is not large enough to install ReactOS.\n" "The install partition must have a size of at least %lu MB.\n" "\n" - " * Press any key to continue.", + " * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï.", NULL }, { @@ -1507,13 +1506,13 @@ "You can not create a new primary or extended partition in the\n" "partition table of this disk because the partition table is full.\n" "\n" - " * Press any key to continue." + " * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï." }, { //ERROR_ONLY_ONE_EXTENDED, "You can not create more than one extended partition per disk.\n" "\n" - " * Press any key to continue." + " * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï." }, { NULL, @@ -1627,23 +1626,21 @@ {STRING_PLEASEWAIT, " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, + " ENTER = áâ ®¢¨âì P = ¥à¢¨çë© à §¤¥« E = áè¨à¥ë© F3 = ëå®¤"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = áâ ®¢¨âì L = ®§¤ âì «®£¨ç¥áª¨© à §¤¥« F3 = ëå®¤"}, {STRING_INSTALLDELETEPARTITION, " ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, {STRING_PARTITIONSIZE, " §¬¥à ®¢®£® à §¤¥« :"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a primary partition on"}, -// "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, + "ë å®â¨â¥ á®§¤ âì ¯¥à¢¨çë© à §¤¥« "}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, - "You have chosen to create an extended partition on"}, + "ë å®â¨â¥ á®§¤ âì à áè¨à¥ë© à §¤¥« "}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "You have chosen to create a logical partition on"}, + "ë å®â¨â¥ á®§¤ âì «®£¨ç¥áª¨© à §¤¥« "}, {STRING_HDDSIZE, "®¦ «ã©áâ , ¢¢¥¤¨â¥ à §¬¥à ®¢®£® à §¤¥« ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, @@ -1657,13 +1654,13 @@ {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."}, {STRING_QUITCONTINUE, - "F3 = ëå®¤ ENTER = à®¤®«¦¥¨¥"}, + "F3 = ëå®¤ ENTER = à®¤®«¦¨âì"}, {STRING_REBOOTCOMPUTER, "ENTER = ¥à¥§ £àã§ª "}, {STRING_TXTSETUPFAILED, "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ©â¨ á¥ªæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"}, {STRING_COPYING, - " ®¯¨à®¢ ¨¥: %S"}, + " ®¯¨à®¢ ¨¥ ä ©« : %S"}, {STRING_SETUPCOPYINGFILES, "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, {STRING_REGHIVEUPDATE, @@ -1673,7 +1670,7 @@ {STRING_DISPLAYETTINGSUPDATE, " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ íªà ¢ à¥¥áâà¥..."}, {STRING_LOCALESETTINGSUPDATE, - " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ «®ª «¨..."}, + " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ ï§ëª ..."}, {STRING_KEYBOARDSETTINGSUPDATE, " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ à áª« ¤ª¨ ª« ¢¨ âãàë..."}, {STRING_CODEPAGEINFOUPDATE, @@ -1727,7 +1724,7 @@ {STRING_MAXSIZE, " (¬ ªá. %lu )"}, {STRING_EXTENDED_PARTITION, - "Extended Partition"}, + " áè¨à¥ë© à §¤¥«"}, {STRING_UNFORMATTED, "®¢ë© (¥®âä®à¬ â¨à®¢ ë©)"}, {STRING_FORMATUNUSED, @@ -1741,6 +1738,6 @@ {STRING_GB, ""}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "®¡ ¢«¥¨¥ à áª« ¤ª¨ ª« ¢¨ âãàë"}, {0, 0} }; 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] Mon Mar 30 21:40:50 2015 @@ -39,7 +39,7 @@ CALL [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ]Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð° [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ]\n\n\ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÐÐ°Ð±Ð¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸, Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÑ\n\ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð¼Ñ ÑÐ°Ð¹Ð»Ñ." - STRING_CD_HELP "ÐÑÐ²Ð¾Ð´ Ð¸Ð¼ÐµÐ½Ð¸ Ð»Ð¸Ð±Ð¾ ÑÐ¼ÐµÐ½Ð° ÑÐµÐºÑÑÐµÐ³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°.\n\n\ + STRING_CD_HELP "ÐÑÐ²Ð¾Ð´ ÑÐµÐºÑÑÐµÐ³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð° Ð»Ð¸Ð±Ð¾ ÐµÐ³Ð¾ ÑÐ¼ÐµÐ½Ð°.\n\n\ CHDIR [/D][Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ]\n\ CHDIR[..|.]\n\ CD [/D][Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ]\n\ @@ -362,7 +362,7 @@ /W ÐÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð²ÑÑÐ°Ð²ÐºÐ¸ Ð´Ð¸ÑÐºÐ° Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ.\n\ /U ÐÐ°Ð¼ÐµÐ½Ð° ÑÐ¾Ð»ÑÐºÐ¾ ÑÐ°Ð¹Ð»Ð¾Ð², Ð±Ð¾Ð»ÐµÐµ ÑÑÐ°ÑÑÑ, ÑÐµÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐµ.\n\ ÐÑÐ¾Ñ ÐºÐ»ÑÑ Ð½ÐµÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ Ñ ÐºÐ»ÑÑÐ¾Ð¼ /A.\n" - STRING_REPLACE_HELP2 "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ ÑÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÑÑ Ðº Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð°Ð¼.\n" + STRING_REPLACE_HELP2 "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ ÑÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÑÑ Ðº Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÑÐ°Ð¹Ð»Ð°Ð¼\n" STRING_REPLACE_HELP3 "ÐÐ¸ Ð¾Ð´Ð¸Ð½ ÑÐ°Ð¹Ð» Ð½Ðµ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½\n" STRING_REPLACE_HELP4 "%lu ÑÐ°Ð¹Ð»(Ð¾Ð²) Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾\n" STRING_REPLACE_HELP5 "ÐÐ°Ð¼ÐµÐ½Ð° %s\n" @@ -392,7 +392,7 @@ ÑÑÑÐ¾ÐºÐ° ÐÑÐ´ÑÑÐ¸Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸.\n" STRING_TIME_HELP1 "ÐÑÐ²Ð¾Ð´ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð²ÑÐµÐ¼ÐµÐ½Ð¸.\n\n\ TIME [/T][Ð²ÑÐµÐ¼Ñ]\n\n\ - /T Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ Ð²ÑÐµÐ¼Ñ\n\n\ + /T ÑÐ¾Ð»ÑÐºÐ¾ Ð²ÑÐ²ÐµÑÑÐ¸ Ð²ÑÐµÐ¼Ñ\n\n\ TIME Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑÐµÐºÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ Ð¸ Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ\n\ Ð½Ð¾Ð²Ð¾Ðµ Ð²ÑÐµÐ¼Ñ. ÐÐ°Ð¶Ð°ÑÐ¸Ðµ ENTER ÑÐ¾ÑÑÐ°Ð½Ð¸Ñ ÑÐµÐºÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ.\n" STRING_TIME_HELP2 "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð²ÑÐµÐ¼Ñ: " @@ -427,7 +427,7 @@ /C ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°Ð½Ð¸Ðµ Ð°Ð²ÑÐ¾ÑÐ¾Ð².\n\ /R Displays redistribution information.\n\ /W ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð³Ð°ÑÐ°Ð½ÑÐ¸Ð¹." - STRING_VERSION_HELP2 " Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑÑÑ ÐÐÐ ÐÐ¡Ð¯ÐÐÐ¥ ÐÐÐ ÐÐÐ¢ÐÐ; Ð´Ð»Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸\n\ + STRING_VERSION_HELP2 " Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑÑÑ ÐÐÐ ÐÐÐÐÐ¥-ÐÐÐÐ ÐÐÐ ÐÐÐ¢ÐÐ; Ð´Ð»Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸\n\ Ð²Ð²ÐµÐ´Ð¸ÑÐµ: `ver /w'. This is free software, and you are welcome to redistribute\n\ it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n\ listing of credits." @@ -446,7 +446,7 @@ STRING_VOL_HELP1 " Ð¢Ð¾Ð¼ Ð² ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ %c Ð¸Ð¼ÐµÐµÑ Ð¼ÐµÑÐºÑ %s\n" STRING_VOL_HELP2 " Ð¢Ð¾Ð¼ Ð² ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ %c Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð¼ÐµÑÐºÐ¸\n" STRING_VOL_HELP3 " Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ¾Ð¼Ð°: %04X-%04X\n" - STRING_VOL_HELP4 "ÐÑÐ²Ð¾Ð´Ð¸Ñ Ð¼ÐµÑÐºÑ ÑÐ¾Ð¼Ð° Ð¸ ÑÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ.\n\nVOL [Ð´Ð¸ÑÐº:]" + STRING_VOL_HELP4 "ÐÑÐ²Ð¾Ð´Ð¸Ñ Ð¼ÐµÑÐºÑ ÑÐ¾Ð¼Ð° Ð¸ ÑÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ, ÐµÑÐ»Ð¸ Ð¾Ð½Ð¸ ÑÑÑÐµÑÑÐ²ÑÑÑ.\n\nVOL [Ð´Ð¸ÑÐº:]" STRING_WINDOW_HELP1 "ÐÐµÐ½ÑÐµÑ Ð²Ð¸Ð´ Ð¾ÐºÐ½Ð° ÐºÐ¾Ð½ÑÐ¾Ð»Ð¸\n\n\ WINDOW [/POS[=]Ð»ÐµÐ²Ð¾,Ð²ÐµÑÑ,ÑÐ¸ÑÐ¸Ð½Ð°,Ð²ÑÑÐ¾ÑÐ°]\n\ [MIN | MAX | RESTORE] ['Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº']\n\n\ @@ -469,13 +469,13 @@ STRING_ASSOC_ERROR "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð²ÑÑ Ð°ÑÑÐ¾ÑÐ¸Ð°ÑÐ¸Ð¹ Ð´Ð»Ñ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ %s\n" STRING_BATCH_ERROR "ÐÑÐ¸Ð±ÐºÐ° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°\n" STRING_CHCP_ERROR1 "Ð¢ÐµÐºÑÑÐ°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°: %u\n" - STRING_CHCP_ERROR4 "ÐÑÐ¸Ð±Ð¾ÑÐ½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°\n" - STRING_CHOICE_ERROR "ÐÑÐ¸Ð±Ð¾ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /C[:]Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" - STRING_CHOICE_ERROR_TXT "ÐÑÐ¸Ð±Ð¾ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /T[:]c,nn" - STRING_CHOICE_ERROR_OPTION "ÐÑÐ¸Ð±Ð¾ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ: %s" - STRING_CMD_ERROR1 "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÑ Ð²Ð²Ð¾Ð´ Ð¸Ð· ÑÐ°Ð¹Ð»Ð° %s\n" + STRING_CHCP_ERROR4 "ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°\n" + STRING_CHOICE_ERROR "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /C[:]Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" + STRING_CHOICE_ERROR_TXT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /T[:]c,nn" + STRING_CHOICE_ERROR_OPTION "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ: %s" + STRING_CMD_ERROR1 "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÑ Ð²Ð²Ð¾Ð´ Ð¸Ð· ÑÐ°Ð¹Ð»Ð° %s\n" STRING_CMD_ERROR2 "ÐÑÐ¸Ð±ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ pipe-Ð´Ð°Ð½Ð½ÑÑ\n" - STRING_CMD_ERROR3 "ÐÐµ Ð¼Ð¾Ð³Ñ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÑ Ð² ÑÐ°Ð¹Ð» %s\n" + STRING_CMD_ERROR3 "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÑ Ð² ÑÐ°Ð¹Ð» %s\n" STRING_CMD_ERROR4 "ÐÐ°Ð¿ÑÑÐº %s...\n" STRING_CMD_ERROR5 "ÐÐ°Ð¿ÑÑÐº cmdexit.bat...\n" STRING_COLOR_ERROR1 "ÐÐ´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐµ ÑÐ²ÐµÑÐ°! (Ð¦Ð²ÐµÑÐ° ÑÐ¾Ð½Ð° Ð¸ ÑÐµÐºÑÑÐ° Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸)" @@ -496,7 +496,7 @@ STRING_FOR_ERROR2 "ÑÐºÐ¾Ð±Ð¾Ðº Ð½Ðµ Ð¾Ð±Ð½Ð°ÑÑÐ¶ÐµÐ½Ð¾." STRING_FOR_ERROR3 "'do' Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ." STRING_FOR_ERROR4 "Ð½ÐµÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¿Ð¾ÑÐ»Ðµ 'do'." - STRING_FREE_ERROR1 "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð¸ÑÐºÐ°" + STRING_FREE_ERROR1 "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð¸ÑÐºÐ°" STRING_FREE_ERROR2 "Ð½Ðµ Ð¾ÑÐ¼ÐµÑÐµÐ½Ð¾" STRING_GOTO_ERROR1 "ÐÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð° Ð¼ÐµÑÐºÐ° Ð´Ð»Ñ GOTO" STRING_GOTO_ERROR2 "ÐÐµÑÐºÐ° '%s' Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°\n" @@ -504,10 +504,10 @@ STRING_MD_ERROR2 "ÐÑÑÑ Ðº Ð½Ð¾Ð²Ð¾Ð¼Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[ÐÑÐ¸Ð±ÐºÐ°]\n" - STRING_REN_ERROR1 "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ MoveFile() Ð±ÑÐ»Ð¾ Ð½Ðµ ÑÑÐ¿ÐµÑÐ½ÑÐ¼. ÐÑÐ¸Ð±ÐºÐ°: %lu\n" + STRING_REN_ERROR1 "ÐÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ MoveFile() Ð±ÑÐ»Ð¾ Ð½Ðµ ÑÐ´Ð°ÑÐ½ÑÐ¼. ÐÑÐ¸Ð±ÐºÐ°: %lu\n" STRING_START_ERROR1 "ÐÐ° Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½ÐµÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¸ Ð¿Ð°ÐºÐµÑÐ½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð²!" - STRING_TIME_ERROR1 "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ." - STRING_TYPE_ERROR1 "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '/%s'\n" + STRING_TIME_ERROR1 "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ." + STRING_TYPE_ERROR1 "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '/%s'\n" STRING_WINDOW_ERROR1 "Ð¾ÐºÐ½Ð¾ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾" STRING_ERROR_PARAMETERF_ERROR "ÐÐµÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° - %c\n" STRING_ERROR_INVALID_SWITCH "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ - /%c\n" @@ -515,9 +515,9 @@ STRING_ERROR_PATH_NOT_FOUND "ÐÑÑÑ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½\n" STRING_ERROR_FILE_NOT_FOUND "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½\n" STRING_ERROR_REQ_PARAM_MISSING "ÐÑÑÑÑÑÑÐ²ÑÐµÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ\n" - STRING_ERROR_INVALID_DRIVE "ÐÑÐ¸Ð±Ð¾ÑÐ½Ð¾Ðµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð´Ð¸ÑÐºÐ°\n" - STRING_ERROR_INVALID_PARAM_FORMAT "ÐÑÐ¸Ð±Ð¾ÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° - %s\n" - STRING_ERROR_BADCOMMAND "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð½ÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð° - %s\n" + STRING_ERROR_INVALID_DRIVE "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð´Ð¸ÑÐºÐ°\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° - %s\n" + STRING_ERROR_BADCOMMAND "ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð½ÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð° - %s\n" STRING_ERROR_OUT_OF_MEMORY "ÐÐµÑÐ²Ð°ÑÐºÐ° Ð¿Ð°Ð¼ÑÑÐ¸.\n" STRING_ERROR_CANNOTPIPE "ÐÑÐ¸Ð±ÐºÐ°! ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ pipe! ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð²ÑÐµÐ¼ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð»!\n" STRING_ERROR_D_PAUSEMSG "ÐÐ»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Ð»ÑÐ±ÑÑ ÐºÐ»Ð°Ð²Ð¸ÑÑ . . ." @@ -530,20 +530,20 @@ STRING_REPLACE_ERROR5 "ÐÐ¾ÑÑÑÐ¿ Ð·Ð°Ð¿ÑÐµÑÐµÐ½ - %s\n" STRING_REPLACE_ERROR6 "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð² - %s\n" STRING_REPLACE_ERROR7 "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ° 32\n" - STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " + STRING_CMD_INFOLINE " ReactOS ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° ÐÐ²ÐµÐ´Ð¸ÑÐµ HELP Ð´Ð»Ñ Ð¡Ð¿ÑÐ°Ð²ÐºÐ¸ " STRING_REACTOS_VERSION "ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° ReactOS [ÐÐµÑÑÐ¸Ñ %s-%s]\n" STRING_CMD_SHELLINFO "\nÐÐ½ÑÐµÑÐ¿ÑÐµÑÐ°ÑÐ¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ ReactOS\nÐÐµÑÑÐ¸Ñ %s %s" STRING_VERSION_RUNNING_ON "ÐÐ°Ð¿ÑÑÐµÐ½ Ð½Ð°: " - STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" + STRING_VERSION_RUNVER "%s [ÐÐµÑÑÐ¸Ñ %d.%d.%d] %s" STRING_COPY_FILE " %d ÑÐ°Ð¹Ð»(Ð¾Ð²) ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾\n" STRING_DELETE_WIPE "Ð¾ÑÐ¸ÑÐµÐ½Ð¾" STRING_FOR_ERROR "Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð·Ð°Ð´Ð°Ð½Ð¸Ðµ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹." STRING_SCREEN_COL "Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÐºÐ¾Ð»Ð¾Ð½Ð¾Ðº" STRING_SCREEN_ROW "Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÑÑÑÐ¾Ðº" STRING_TIMER_TIME "Timer %d is %s: " - STRING_MKLINK_CREATED_SYMBOLIC "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð¸ÑÐµÑÐºÐ°Ñ ÑÑÑÐ»ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð° Ð´Ð»Ñ %s <<===>> %s\n" - STRING_MKLINK_CREATED_HARD "ÐÐµÑÑÐºÐ°Ñ ÑÐ²ÑÐ·Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð° Ð´Ð»Ñ %s <<===>> %s\n" - STRING_MKLINK_CREATED_JUNCTION "Ð¡ÑÑÐ»ÐºÐ°-ÐºÐ°ÑÐ°Ð»Ð¾Ð³ ÑÐ¾Ð·Ð´Ð°Ð½Ð° Ð´Ð»Ñ %s <<===>> %s\n" + STRING_MKLINK_CREATED_SYMBOLIC "Ð¡Ð¸Ð¼Ð²Ð¾Ð»ÑÐ½Ð°Ñ ÑÑÑÐ»ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð° Ð´Ð»Ñ %s <<===>> %s\n" + STRING_MKLINK_CREATED_HARD "ÐÐµÑÑÐºÐ°Ñ ÑÑÑÐ»ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð° Ð´Ð»Ñ %s <<===>> %s\n" + STRING_MKLINK_CREATED_JUNCTION "Ð¢Ð¾ÑÐºÐ° ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð° Ð´Ð»Ñ %s <<===>> %s\n" STRING_MORE "ÐÑÐµ? " STRING_CANCEL_BATCH_FILE "\r\nÐÐ°Ð²ÐµÑÑÐ¸ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° [Y(Ð´Ð°)/N(Ð½ÐµÑ)]? " STRING_INVALID_OPERAND "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¾Ð¿ÐµÑÐ°Ð½Ð´." Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -7,8 +7,8 @@ BEGIN IDS_APP_HEADER "ReactOS DiskPart" IDS_APP_USAGE "\nDisk Partitioning Interpreter.\n\n\ -ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: DISKPART [/S <Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°>] [/T <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>] [/?]\n\n\ -/S <Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð°>\tÐÐ°Ð¿ÑÑÐºÐ°ÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐºÑÐ¸Ð¿Ñ.\n\ +ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: DISKPART [/S <Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°>] [/T <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>] [/?]\n\n\ +/S <Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð°>\tÐÐ°Ð¿ÑÑÐºÐ°ÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐºÑÐ¸Ð¿Ñ.\n\ /T <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>\tTimeout in seconds to prevent diskpart usage overlap.\n\ /?\t\tÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÑÑ ÑÐ¿ÑÐ°Ð²ÐºÑ.\n\n" IDS_APP_LICENSE "Ð Ð°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ GNU GPLv2\n" @@ -27,7 +27,7 @@ IDS_DETAIL_INFO_TARGET "Ð¦ÐµÐ»Ñ" IDS_DETAIL_INFO_LUN_ID "LUN ID" IDS_DETAIL_INFO_LOC_PATH "Location Path" - IDS_DETAIL_INFO_CURR_RO_STATE "Current Read-only State" + IDS_DETAIL_INFO_CURR_RO_STATE "Ð¢ÐµÐºÑÑÐµÐµ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ""Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ""" IDS_DETAIL_INFO_RO "Ð¢Ð¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ" IDS_DETAIL_INFO_BOOT_DSK "ÐÐ°Ð³ÑÑÐ·Ð¾ÑÐ½ÑÐ¹ Ð´Ð¸ÑÐº" IDS_DETAIL_INFO_PAGE_FILE_DSK "Pagefile Ð´Ð¸ÑÐº" @@ -40,7 +40,7 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD "ÐÐ¸ÑÐº ### Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ\tÐ Ð°Ð·Ð¼ÐµÑ\tÐ¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾\tÐÐ¸Ð½\tGPT\n" - IDS_LIST_DISK_LINE "-------- ------\t----\t----\t---\t---\n" + IDS_LIST_DISK_LINE "-------- ---------\t------\t--------\t---\t---\n" IDS_LIST_VOLUME_HEAD "Ð¢Ð¾Ð¼ ###\tÐÐ¼Ñ\tÐÐµÑÐºÐ°\n" END Modified: trunk/reactos/base/system/regsvr32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -2,18 +2,18 @@ STRINGTABLE BEGIN - IDS_UsageMessage "%s\n\nÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: regsvr32 [/u] [/s] [/c] [/n] [/i[:Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ]] Ð¸Ð¼Ñ_dll\n\ -/u - ÐÑÐ¼ÐµÐ½Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸ ÑÐµÑÐ²ÐµÑÐ°\n\ -/s - Ð¢Ð¸ÑÐ¸Ð¹; Ð½Ðµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¾ÐºÐ¾Ð½ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹\n\ + IDS_UsageMessage "%s\n\nÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: regsvr32 [/u] [/s] [/c] [/n] [/i[:Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ]] DLL-ÑÐ°Ð¹Ð»\n\ +/u - ÐÑÐ¼ÐµÐ½Ð° ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸ DLL\n\ +/s - ""Ð¢Ð¸ÑÐ¸Ð¹"" ÑÐµÐ¶Ð¸Ð¼; Ð¾ÐºÐ½Ð° ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð½Ðµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ\n\ /c - ÐÑÐ²Ð¾Ð´ Ð² ÐºÐ¾Ð½ÑÐ¾Ð»Ñ\n\ -/i - ÐÑÐ·ÑÐ²Ð°ÐµÑ DllInstall Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð¼ [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ]; ÐÑÐ¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ ÐºÐ»ÑÑÐ° /u Ð²ÑÐ·ÑÐ²Ð°ÐµÑ DllUninstall\n\ +/i - ÐÑÐ·Ð¾Ð² DllInstall Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð¼ [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ]; ÐÑÐ¸ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ ÐºÐ»ÑÑÐ° /u Ð²ÑÐ·ÑÐ²Ð°ÐµÑ DllUnInstall\n\ /n - ÐÐµ Ð²ÑÐ·ÑÐ²Ð°ÐµÑ DllRegisterServer; ÑÑÐ° Ð¾Ð¿ÑÐ¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ñ /i" IDS_NoDllSpecified "ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð¸Ð¼Ñ DLL." IDS_InvalidFlag "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ: %s" IDS_SwitchN_NoI "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ: /n Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ ÑÐ¾Ð²Ð¼ÐµÑÑÐ½Ð¾ Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð¼ /i" IDS_DllNotLoaded "ÐÑÐ·Ð¾Ð² LoadLibrary('%s') Ð·Ð°Ð²ÐµÑÑÐ¸Ð»ÑÑ Ð½ÐµÑÐ´Ð°ÑÐµÐ¹.\nÐ¤ÑÐ½ÐºÑÐ¸Ñ GetLastError Ð²Ð¾Ð·Ð²ÑÐ°ÑÐ¸Ð»Ð° ÐºÐ¾Ð´ Ð¾ÑÐ¸Ð±ÐºÐ¸: 0x%08x." IDS_MissingEntry "%s Ð±ÑÐ» Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½, Ð½Ð¾ ÑÐ¾ÑÐºÐ° Ð²ÑÐ¾Ð´Ð° %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°.\n\n\ -%s Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð½ÐµÑÐºÑÐ¿Ð¾ÑÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ %s Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð² Ð¿Ð°Ð¼ÑÑÐ¸. ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ PView, ÑÑÐ¾Ð±Ñ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸ÑÑ Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐµÐ³Ð¾." +%s Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð½Ðµ ÑÐºÑÐ¿Ð¾ÑÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÑÐµÐ¶Ð´ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ %s Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð² Ð¿Ð°Ð¼ÑÑÐ¸. ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ PView, ÑÑÐ¾Ð±Ñ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸ÑÑ Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐµÐ³Ð¾." IDS_FailureMessage "%s Ð² %s Ð·Ð°Ð²ÐµÑÑÐ¸Ð»ÑÑ Ð½ÐµÑÐ´Ð°ÑÐµÐ¹.\nÐÐ¾Ð·Ð²ÑÐ°ÑÐµÐ½Ð½ÑÐ¹ ÐºÐ¾Ð´: 0x%08x" IDS_SuccessMessage "%s Ð² %s ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾." END Added: trunk/reactos/base/system/services/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/ru-RU.rc (added) +++ trunk/reactos/base/system/services/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -0,0 +1,14 @@ +/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_SERVICE_START "Ð¡ÑÐ°ÑÑ" + IDS_SERVICE_STOP "Ð¡ÑÐ¾Ð¿" + IDS_SERVICE_PAUSE "ÐÐ°ÑÐ·Ð°" + IDS_SERVICE_RESUME "ÐÐ¾Ð·Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ" + IDS_SERVICE_RUNNING "ÐÐ°Ð¿ÑÑÐµÐ½Ð¾" + IDS_SERVICE_STOPPED "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾" + IDS_SERVICE_PAUSED "ÐÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾" +END Propchange: trunk/reactos/base/system/services/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -23,3 +23,7 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif + +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc (added) +++ trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -0,0 +1,55 @@ +/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +#if 0 +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Power Meter" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Power status", 1001, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "&Always show icon on the taskbar.", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "Show details for each &battery.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END +#endif + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "&Adjust Power Properties" + IDS_PWR_METER "&Open Power Meter" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" + IDS_PWR_CHARGING " (charging)" + IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" + IDS_PWR_AC "On AC power" + IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" + IDS_PWR_MINUTES_REMAINING "%1!u! min (%2!u!%%) remaining" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware" + IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware" + IDS_HOTPLUG_REMOVE_3 "Safely remove %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - Drive(%s)" + IDS_HOTPLUG_DRIVES " - Drives(%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIERES "This hardware requires ""Safe Removal""" + IDS_HOTPLUG_CLICK "Before removing this hardware, click on this icon and select the hardware you want to remove." + + //Volume related strings + IDS_VOL_VOLUME "Volume" + IDS_VOL_ADJUST "&Adjust Audio Properties" + IDS_VOL_OPEN "&Open Volume Control" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "Volume (muted)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "ÐÐ°Ð»Ð¸Ð¿Ð°Ð½Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸Ñ" + IDS_KEYS_MOUSE "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐºÐ°Ð·Ð°ÑÐµÐ»ÐµÐ¼ Ñ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ" + IDS_KEYS_FILTER "Ð¤Ð¸Ð»ÑÑÑÐ°ÑÐ¸Ñ Ð²Ð²Ð¾Ð´Ð°" +END Propchange: trunk/reactos/dll/shellext/stobject/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -28,6 +28,9 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -138,7 +138,7 @@ STRINGTABLE BEGIN - IDS_CANCELLING "ÐÑÐ¼ÐµÐ½Ð°..." + IDS_CANCELLING "ÐÑÐµÑÑÐ²Ð°Ð½Ð¸Ðµ..." IDS_REMAINING "ÐÑÑÐ°Ð»Ð¾ÑÑ" END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -698,18 +698,18 @@ IDS_OVERWRITEFILE_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð·Ð°Ð¼ÐµÐ½Ñ ÑÐ°Ð¹Ð»Ð°" IDS_OVERWRITEFOLDER_TEXT "ÐÑÐ° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¶Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð¿Ð°Ð¿ÐºÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%1'.\n\nÐÑÐ»Ð¸ Ð² Ð¿Ð°Ð¿ÐºÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸, ÑÐ¾ Ð¾Ð½Ð¸ ÑÐ°Ðº Ð¶Ðµ Ð±ÑÐ´ÑÑ\nÐ·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" - IDS_FILEOOP_FROM_TO "From %1 to %2" - IDS_FILEOOP_FROM "From %1" - IDS_FILEOOP_PREFLIGHT "Preflight" + IDS_FILEOOP_COPYING "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" + IDS_FILEOOP_MOVING "ÐÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ðµ" + IDS_FILEOOP_DELETING "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ" + IDS_FILEOOP_FROM_TO "ÐÐ· %1 Ð² %2" + IDS_FILEOOP_FROM "ÐÐ· %1" + IDS_FILEOOP_PREFLIGHT "ÐÐ¾Ð´Ð³Ð¾ÑÐ¾Ð²ÐºÐ°" /* message box strings */ IDS_RESTART_TITLE "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ°" IDS_RESTART_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ReactOS?" IDS_SHUTDOWN_TITLE "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ" - IDS_SHUTDOWN_PROMPT "ÐÐ°ÐºÐ¾Ð½ÑÐ¸ÑÑ ÑÐ°Ð±Ð¾ÑÑ Ñ ReactOS?" + IDS_SHUTDOWN_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ ÑÐ°Ð±Ð¾ÑÑ ReactOS?" IDS_LOGOFF_TITLE "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°" IDS_LOGOFF_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ?" Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=669… ============================================================================== --- trunk/reactos/media/inf/acpi.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/acpi.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -81,8 +81,10 @@ *PNP0C08.DeviceDesc = "Dispozitive ACPI" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°)" -*PNP0C08.DeviceDesc = "ACPI Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" +*PNP0C08.DeviceDesc = "ACPI ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" [Strings.041B] GenericMfg = "(GenerickÃ© systÃ©movÃ© zariadenia)" Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=66… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -90,6 +90,10 @@ ReactOS = "Echipa ReactOS" AUDIOClassName = "Dispozitive audio & video" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +AUDIOClassName = "ÐÑÐ´Ð¸Ð¾ Ð¸ Ð²Ð¸Ð´ÐµÐ¾ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + [Strings.0422] ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" AUDIOClassName = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ Ð°ÑÐ´ÑÐ¾ ÑÐ° Ð²ÑÐ´ÐµÐ¾" Modified: trunk/reactos/media/inf/battery.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/battery.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/battery.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/battery.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -96,6 +96,14 @@ ACPI\PNP0C0A.DeviceDesc = "MetodÄ de control acumulator conformÄ cu ACPI" ACPI\ACPI0003.DeviceDesc = "Adaptor CA" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +BatteryClassName = "ÐÐ°ÑÐ°ÑÐµÐ¸" + +GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ Ð±Ð°ÑÐ°ÑÐµÐ¸)" +ACPI\PNP0C0A.DeviceDesc = "ÐÐ°ÑÐ°ÑÐµÐ¸ Ñ ACPI-ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐ¼ Ð¼ÐµÑÐ¾Ð´Ð¾Ð¼ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" +ACPI\ACPI0003.DeviceDesc = "AC Ð°Ð´Ð°Ð¿ÑÐµÑ" + [Strings.0422] ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" BatteryClassName = "ÐÐ°ÑÐ°ÑÐµÑ" Modified: trunk/reactos/media/inf/bth.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bth.inf?rev=6698… ============================================================================== --- trunk/reactos/media/inf/bth.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/bth.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -74,3 +74,9 @@ ReactOS="Echipa ReactOS" BTUSB.DeviceDesc="Radio Bluetooth USB generic" BluetoothClassName="Radiouri Bluetooth" + +[Strings.0419] +ReactOS="ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +BTUSB.DeviceDesc="Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹ USB Bluetooth ÑÐ°Ð´Ð¸Ð¾Ð¼Ð¾Ð´ÑÐ»Ñ" +BluetoothClassName="Ð Ð°Ð´Ð¸Ð¾Ð¼Ð¾Ð´ÑÐ»Ð¸ Bluetooth" + Modified: trunk/reactos/media/inf/c_image.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/c_image.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/c_image.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/c_image.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -38,3 +38,7 @@ [Strings.0418] ReactOS = "Echipa ReactOS" ImageClassName = "Imagine" + +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +ImageClassName = "ÐÐ±ÑÐ°Ð·" Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=66… ============================================================================== --- trunk/reactos/media/inf/cdrom.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/cdrom.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -94,7 +94,10 @@ GenericMfg = "(dispozitive DVD/CD-ROM generice)" [Strings.0419] -CDROMClassName = "ÐÐ¸ÑÐºÐ¾Ð²Ð¾Ð´ DVD/CD-ROM" +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +CDROMClassName = "DVD/CD-ROM Ð¿ÑÐ¸Ð²Ð¾Ð´Ñ" +GenCdRom.DeviceDesc = "CD-ROM Ð¿ÑÐ¸Ð²Ð¾Ð´" +GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ DVD/CD-ROM Ð¿ÑÐ¸Ð²Ð¾Ð´Ñ)" [Strings.0422] ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=6698… ============================================================================== --- trunk/reactos/media/inf/cpu.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/cpu.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -292,9 +292,37 @@ ViaProcessor.DeviceDesc = "Procesor VIA" [Strings.0419] + +ReactOS = "Ð¤Ð¾Ð½Ð´ ReactOS" +ProcessorClassName = "ÐÑÐ¾ÑÐµÑÑÐ¾ÑÑ" + Processor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÑÐ¾Ñ" -IntelProcessor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÑÐ¾Ñ Intel" +CyrixProcessor.DeviceDesc = "Cyrix 6x86 Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelProcessor.DeviceDesc = "Intel Pentium Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelPROProcessor.DeviceDesc = "Intel Pentium Pro Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelP2Processor.DeviceDesc = "Intel Pentium II / Celeron Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelAtomProcessor.DeviceDesc = "Intel Atom Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelCoreProcessor.DeviceDesc = "Intel Intel Core Solo/Duo/Ex / Celeron / Xeon / M Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +IntelCoreiXProcessor.DeviceDesc = "Intel Core i* Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDProcessor.DeviceDesc = "AMD Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDK6Processor.DeviceDesc = "AMD K6 Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDK62Processor.DeviceDesc = "AMD K6-2 Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDK63Processor.DeviceDesc = "AMD K6-III / Geode Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDK7Processor.DeviceDesc = "AMD Athlon / Duron / Geode NX / Sempron Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDK8Processor.DeviceDesc = "AMD Athlon 64 / Turion 64 / Opteron / Sempron Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDPHENProcessor.DeviceDesc = "AMD Athlon 64 X / Turion 64 X / Phenom Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +AMDQProcessor.DeviceDesc = "AMD Athlon 64 Q* / Turion 64 *M / Sempron S* Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +TransmetaProcessor.DeviceDesc = "Transmeta Crusoe Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" Standard = "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹ Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +ViaC7Processor.DeviceDesc = "VIA C7 Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +ViaNEHProcessor.DeviceDesc = "VIA Nehemiah Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +ViaESTProcessor.DeviceDesc = "VIA Esther Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +ViaNANOProcessor.DeviceDesc = "VIA Nano Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" +ViaProcessor.DeviceDesc = "VIA Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" [Strings.041B] Processor.DeviceDesc = "Procesor" Modified: trunk/reactos/media/inf/disk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/disk.inf?rev=669… ============================================================================== --- trunk/reactos/media/inf/disk.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/disk.inf [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -90,6 +90,14 @@ OpticalDisk.DeviceDesc = "Dispozitiv disc optic" Disk.ServiceDesc = "Modul-pilot de disc" +[Strings] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ Ð´Ð¸ÑÐºÐ¾Ð²ÑÐµ Ð½Ð°ÐºÐ¾Ð¿Ð¸ÑÐµÐ»Ð¸)" +DiskClassName = "ÐÐ¸ÑÐºÐ¾Ð²ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" +Disk.DeviceDesc = "ÐÐ¸ÑÐºÐ¾Ð²Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" +OpticalDisk.DeviceDesc = "ÐÐ¿ÑÐ¸ÑÐµÑÐºÐ¾Ðµ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" +Disk.ServiceDesc = "ÐÑÐ°Ð¹Ð²ÐµÑ Ð´Ð¸ÑÐºÐ°" + [Strings.0422] ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ñ Ð¿ÑÐ¸Ð²Ð¾Ð´Ð¸ Ð´Ð¸ÑÐºÑÐ²)" Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -8,23 +8,23 @@ IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÑ" IDS_SELECTALL "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²ÑÐµ" IDS_SCROLL "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ" - IDS_FIND "ÐÑÐºÐ°ÑÑ..." + IDS_FIND "ÐÐ°Ð¹ÑÐ¸..." IDS_DEFAULTS "Ð£Ð¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ" IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" /* IDS_SCROLLHERE "Scroll here" IDS_SCROLLTOP "Scroll top" - IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð½Ð¸Ð·" - IDS_SCROLLPAGE_UP "ÐÐ²ÐµÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" - IDS_SCROLLPAGE_DOWN "ÐÐ½Ð¸Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ" - IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð²ÐµÑÑ" + IDS_SCROLLBOTTOM "Scroll bottom" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "Scroll up" IDS_SCROLLDOWN "Scroll down" */ - IDS_TERMINAL_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS ÐÐ¾Ð½ÑÐ¾Ð»Ñ" END STRINGTABLE BEGIN - IDS_MARK_TITLE "Mark" - IDS_SELECT_TITLE "Select" + IDS_MARK_TITLE "ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ" + IDS_SELECT_TITLE "ÐÑÐ´ÐµÐ»Ð¸ÑÑ" END Modified: trunk/reactos/win32ss/user/winsrv/consrv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -2,5 +2,5 @@ STRINGTABLE BEGIN - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS ÐÐ¾Ð½ÑÐ¾Ð»Ñ" END Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -8,17 +8,17 @@ IDS_PASTE "ÐÑÑÐ°Ð²Ð¸ÑÑ" IDS_SELECTALL "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²ÑÐµ" IDS_SCROLL "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ" - IDS_FIND "ÐÑÐºÐ°ÑÑ..." + IDS_FIND "ÐÐ°Ð¹ÑÐ¸..." IDS_DEFAULTS "Ð£Ð¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ" IDS_PROPERTIES "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" /* IDS_SCROLLHERE "Scroll here" IDS_SCROLLTOP "Scroll top" - IDS_SCROLLBOTTOM "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð½Ð¸Ð·" - IDS_SCROLLPAGE_UP "ÐÐ²ÐµÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ" - IDS_SCROLLPAGE_DOWN "ÐÐ½Ð¸Ð· ÑÑÑÐ°Ð½Ð¸ÑÑ" - IDS_SCROLLUP "ÐÑÐ¾ÐºÑÑÑÐ¸ÑÑ Ð²Ð²ÐµÑÑ" + IDS_SCROLLBOTTOM "Scroll bottom" + IDS_SCROLLPAGE_UP "Page up" + IDS_SCROLLPAGE_DOWN "Page down" + IDS_SCROLLUP "Scroll up" IDS_SCROLLDOWN "Scroll down" */ - IDS_TERMINAL_TITLE "ReactOS Console" + IDS_TERMINAL_TITLE "ReactOS ÐÐ¾Ð½ÑÐ¾Ð»Ñ" END Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -2,5 +2,5 @@ STRINGTABLE BEGIN - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS ÐÐ¾Ð½ÑÐ¾Ð»Ñ" END Modified: trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc [iso-8859-1] Mon Mar 30 21:40:50 2015 @@ -7,7 +7,7 @@ BEGIN LTEXT "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ... ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ", IDC_STATIC, 7, 7, 186, 11 CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ¾ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ""", IDC_STATIC, 7, 40, 186, 26 + LTEXT "ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ, ÑÐ¾ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐµÑÑÑÑ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÐµÐ¹ÑÐ°Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"".", IDC_STATIC, 7, 40, 186, 26 DEFPUSHBUTTON "&ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ", IDC_END_NOW, 150, 71, 43, 17 END

9 years, 8 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 March 2015