Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[dreimer] 65774: [BROWSEUI] update Russian Translation by Akhlamov Petr CORE-7981 #resolve #comment Committed, thx for help ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Dec 20 19:31:44 2014 New Revision: 65774 URL: http://svn.reactos.org/svn/reactos?rev=65774&view=rev Log: [BROWSEUI] update Russian Translation by Akhlamov Petr CORE-7981 #resolve #comment Committed, thx for help ^^ Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc 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] Sat Dec 20 19:31:44 2014 @@ -1,239 +1,258 @@ +/* Russian language resource file by Petr Akhlamov (petr-akhlamov(a)yandex.ru) */ + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* Menus */ IDM_CABINET_CONTEXTMENU MENUEX BEGIN - POPUP "", 264,MFT_STRING,MFS_ENABLED - BEGIN - MENUITEM "&ÐÐ±ÑÑÐ½ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÐ¸", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED - MENUITEM "&ÐÐ´ÑÐµÑÐ½Ð°Ñ ÑÑÑÐ¾ÐºÐ°", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED - MENUITEM "&Ð¡ÑÑÐ»ÐºÐ¸", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED - MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED - MENUITEM "&Text Labels", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED - MENUITEM "&ÐÐ½Ð¾Ð¿ÐºÐ° ÐÐµÑÐµÑÐ¾Ð´", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED - END + POPUP "", 264,MFT_STRING,MFS_ENABLED + BEGIN + MENUITEM "&ÐÐ±ÑÑÐ½ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÐ¸", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED + MENUITEM "&ÐÐ´ÑÐµÑÐ½Ð°Ñ ÑÑÑÐ¾ÐºÐ°", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "&Ð¡ÑÑÐ»ÐºÐ¸", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ°...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&Ð¢ÐµÐºÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED + MENUITEM "&ÐÐ½Ð¾Ð¿ÐºÐ° ÐÐµÑÐµÑÐ¾Ð´", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED + END END IDM_CABINET_MAINMENU MENUEX BEGIN - POPUP "&Ð¤Ð°Ð¹Ð»", FCIDM_MENU_FILE - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ÐÐ°ÐºÑÑÑÑ", IDM_FILE_CLOSE - END - POPUP "&ÐÑÐ°Ð²ÐºÐ°", FCIDM_MENU_EDIT - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END - POPUP "&ÐÐ¸Ð´", FCIDM_MENU_VIEW - BEGIN - POPUP "&ÐÐ°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", IDM_VIEW_TOOLBARS - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END - MENUITEM "Ð¡ÑÑÐ¾ÐºÐ° &ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", IDM_VIEW_STATUSBAR - POPUP "&ÐÐ°Ð½ÐµÐ»Ð¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ", IDM_VIEW_EXPLORERBAR - BEGIN - MENUITEM "&ÐÐ¾Ð¸ÑÐº\tCtrl+E", IDM_EXPLORERBAR_SEARCH - MENUITEM "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ\tCtrl+I", IDM_EXPLORERBAR_FAVORITES - MENUITEM "&ÐÐµÐ´Ð¸Ð°", IDM_EXPLORERBAR_MEDIA - MENUITEM "&ÐÑÑÐ½Ð°Ð»\tCtrl+H", IDM_EXPLORERBAR_HISTORY - MENUITEM "Ð&Ð°Ð¿ÐºÐ¸", IDM_EXPLORERBAR_FOLDERS - MENUITEM "", IDM_EXPLORERBAR_SEPARATOR - END - MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR - POPUP "Ð&ÐµÑÐµÑÐ¾Ð´", FCIDM_MENU_EXPLORE - BEGIN - MENUITEM "&ÐÐ°Ð·Ð°Ð´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð»ÐµÐ²Ð¾", IDM_GOTO_BACK - MENUITEM "&ÐÐ¿ÐµÑÐµÐ´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð¿ÑÐ°Ð²Ð¾", IDM_GOTO_FORWARD - MENUITEM "&ÐÐ²ÐµÑÑ", IDM_GOTO_UPONELEVEL - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ÐÐ¾Ð¼Ð¾Ð¹\tAlt+Home", IDM_GOTO_HOMEPAGE - END - MENUITEM "&ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ", IDM_VIEW_REFRESH - END - POPUP "Ð&Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ", FCIDM_MENU_FAVORITES - BEGIN - MENUITEM "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ...", IDM_FAVORITES_ADDTOFAVORITES - MENUITEM "&Ð£Ð¿Ð¾ÑÑÐ´Ð¾ÑÐ¸ÑÑ Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ...", IDM_FAVORITES_ORGANIZEFAVORITES - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "(Ð¿ÑÑÑÐ¾)", IDM_FAVORITES_EMPTY - END - POPUP "&Ð¡ÐµÑÐ²Ð¸Ñ", FCIDM_MENU_TOOLS - BEGIN - MENUITEM "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ &ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_MAPNETWORKDRIVE - MENUITEM "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_DISCONNECTNETWORKDRIVE - MENUITEM "&Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ...", IDM_TOOLS_SYNCHRONIZE - MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸ ...", IDM_TOOLS_FOLDEROPTIONS - END - POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", FCIDM_MENU_HELP - BEGIN - MENUITEM "&ÐÐµÐ³Ð°Ð»ÑÐ½Ð° Ð»Ð¸ ÑÑÐ° ÐºÐ¾Ð¿Ð¸Ñ ReactOS?", IDM_HELP_ISTHISCOPYLEGAL - MENUITEM "&Ð ReactOS", IDM_HELP_ABOUT - END -END - + POPUP "&Ð¤Ð°Ð¹Ð»", FCIDM_MENU_FILE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&ÐÐ°ÐºÑÑÑÑ", IDM_FILE_CLOSE + END + POPUP "&ÐÑÐ°Ð²ÐºÐ°", FCIDM_MENU_EDIT + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + POPUP "&ÐÐ¸Ð´", FCIDM_MENU_VIEW + BEGIN + POPUP "&ÐÐ°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", IDM_VIEW_TOOLBARS + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "Ð¡ÑÑÐ¾ÐºÐ° &ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ", IDM_VIEW_STATUSBAR + POPUP "&ÐÐ°Ð½ÐµÐ»Ð¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ", IDM_VIEW_EXPLORERBAR + BEGIN + MENUITEM "&ÐÐ¾Ð¸ÑÐº\tCtrl+E", IDM_EXPLORERBAR_SEARCH + MENUITEM "&ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ\tCtrl+I", IDM_EXPLORERBAR_FAVORITES + MENUITEM "&ÐÐµÐ´Ð¸Ð°", IDM_EXPLORERBAR_MEDIA + MENUITEM "&ÐÑÑÐ½Ð°Ð»\tCtrl+H", IDM_EXPLORERBAR_HISTORY + MENUITEM "Ð&Ð°Ð¿ÐºÐ¸", IDM_EXPLORERBAR_FOLDERS + MENUITEM "", IDM_EXPLORERBAR_SEPARATOR + END + MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR + POPUP "Ð&ÐµÑÐµÑÐ¾Ð´", FCIDM_MENU_EXPLORE + BEGIN + MENUITEM "&ÐÐ°Ð·Ð°Ð´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð»ÐµÐ²Ð¾", IDM_GOTO_BACK + MENUITEM "&ÐÐ¿ÐµÑÐµÐ´\tAlt+Ð¡ÑÑÐµÐ»ÐºÐ° Ð²Ð¿ÑÐ°Ð²Ð¾", IDM_GOTO_FORWARD + MENUITEM "&ÐÐ²ÐµÑÑ", IDM_GOTO_UPONELEVEL + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&ÐÐ¾Ð¼Ð¾Ð¹\tAlt+Home", IDM_GOTO_HOMEPAGE + END + MENUITEM "&ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ", IDM_VIEW_REFRESH + END + POPUP "Ð&Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ", FCIDM_MENU_FAVORITES + BEGIN + MENUITEM "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ...", IDM_FAVORITES_ADDTOFAVORITES + MENUITEM "&Ð£Ð¿Ð¾ÑÑÐ´Ð¾ÑÐ¸ÑÑ Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ...", IDM_FAVORITES_ORGANIZEFAVORITES + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "(Ð¿ÑÑÑÐ¾)", IDM_FAVORITES_EMPTY + END + POPUP "&Ð¡ÐµÑÐ²Ð¸Ñ", FCIDM_MENU_TOOLS + BEGIN + MENUITEM "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ &ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº...", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "&Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ...", IDM_TOOLS_SYNCHRONIZE + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸ ...", IDM_TOOLS_FOLDEROPTIONS + END + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", FCIDM_MENU_HELP + BEGIN + MENUITEM "&ÐÐ¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ðµ", IDM_HELP_ISTHISCOPYLEGAL + MENUITEM "&Ð ReactOS", IDM_HELP_ABOUT + END +END + +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&ÐÐ°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&ÐÑÑÑÑÑÐ¹ Ð·Ð°Ð¿ÑÑÐº", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + /* Dialogs */ IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Te&xt options:", -1, 4, 2, 48, 15 - COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Ico&n options:", -1, 4, 20, 48, 15 - COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Te&xt options:", -1, 4, 2, 48, 15 + COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Ico&n options:", -1, 4, 20, 48, 15 + COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END /* Accelerators */ IDR_ACCELERATORS ACCELERATORS BEGIN - VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT - "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT - VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT - "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT - "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT - VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT - VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT - VK_BACK, 41010, NOINVERT, VIRTKEY - "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT - "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT - "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT - "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT + "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT + "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT + VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT + VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY + "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT + "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT + "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT + "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT END /* Strings */ STRINGTABLE BEGIN - 800 "Contains commands for manipulating the selected items." -END - -STRINGTABLE -BEGIN - 864 "Contains edit commands." -END - -STRINGTABLE -BEGIN - 928 "Contains commands for manipulating the view." -END - -STRINGTABLE -BEGIN - 992 "Contains tools commands." -END - -STRINGTABLE -BEGIN - 1056 "Contains commands for displaying Help." -END - -STRINGTABLE -BEGIN - 9025 "ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾." - 9026 "ÐÐ²ÐµÑÑ." -END - -STRINGTABLE -BEGIN - 9121 "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº." - 9122 "ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº." -END - -STRINGTABLE -BEGIN - 9250 "Displays program information, version number, and copyright." - 9252 "Displays information for debugging." -END - -STRINGTABLE -BEGIN - 9281 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° Ð¿ÑÐµÐ´ÑÐ´ÑÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." - 9282 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° ÑÐ»ÐµÐ´ÑÑÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." - 9283 "Enables you to change settings." - 9285 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." -END - -STRINGTABLE -BEGIN - 9362 "ÐÑÐºÑÑÑÑ Ð¿Ð°Ð¿ÐºÑ ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ." - 9363 "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ." -END - -STRINGTABLE -BEGIN - 9505 "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸Ð»Ð¸ ÑÐ¿ÑÑÑÐ°ÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸." - 9506 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ." - 9508 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¾Ð±ÑÑÐ½ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÐ¸." - 9509 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð°Ð´ÑÐµÑÐ½ÑÑ ÑÑÑÐ¾ÐºÑ." - 9510 "Displays the Quick Links bar." - 9516 "ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²." -END - -STRINGTABLE -BEGIN - 9533 "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²." -END - -STRINGTABLE -BEGIN - 9552 "Shows or hides an Explorer bar." - 9553 "Shows the Search bar." - 9554 "Shows the Favorites bar." - 9555 "Shows the History bar." - 9557 "Shows the Folders bar." - 9559 "Shows the Media Bar." -END - -STRINGTABLE -BEGIN - IDS_SMALLICONS "ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" - IDS_LARGEICONS "ÐÑÑÐ¿Ð½ÑÐµ Ð·Ð½Ð°ÑÐºÐ¸" - IDS_SHOWTEXTLABELS "Ð¢ÐµÐºÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸" -END - -STRINGTABLE -BEGIN - IDS_NOTEXTLABELS "ÐÐµÐ· Ð¿Ð¾Ð´Ð¿Ð¸ÑÐµÐ¹ Ðº ÐºÐ½Ð¾Ð¿ÐºÐ°Ð¼" - IDS_SELECTIVETEXTONRIGHT "ÐÑÐ±Ð¾ÑÐ¾ÑÐ½Ð¾ ÑÐµÐºÑÑ ÑÐ¿ÑÐ°Ð²Ð°" -END - -STRINGTABLE -BEGIN - IDS_GOBUTTONLABEL "|ÐÐµÑÐµÑÐ¾Ð´||" - IDS_GOBUTTONTIPTEMPLATE "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ""%s""" -END - -STRINGTABLE -BEGIN - IDS_SEARCHLABEL "ÐÐ¾Ð¸ÑÐº" - IDS_ADDRESSBANDLABEL "Ð&Ð´ÑÐµÑ" -END - -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "ÐÐ°Ð¿ÐºÐ¸" -END - -STRINGTABLE -BEGIN - IDS_HISTORYTEXT "&ÐÑÑÐ¾ÑÐ¸Ñ\tCtrl+H" -END - -STRINGTABLE -BEGIN - IDS_UP "ÐÐ²ÐµÑÑ" -END - -STRINGTABLE -BEGIN - IDS_BACK "ÐÐ°Ð·Ð°Ð´" - IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" -END + 800 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½ÑÐ¼Ð¸ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼Ð¸." +END + +STRINGTABLE +BEGIN + 864 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ." +END + +STRINGTABLE +BEGIN + 928 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÐµÐ¼." +END + +STRINGTABLE +BEGIN + 992 "Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ." +END + +STRINGTABLE +BEGIN + 1056 "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° ÑÐ¿ÑÐ°Ð²ÐºÐ¸." +END + +STRINGTABLE +BEGIN + 9025 "ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾." + 9026 "ÐÐ²ÐµÑÑ." +END + +STRINGTABLE +BEGIN + 9121 "ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº." + 9122 "ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¸ÑÐº." +END + +STRINGTABLE +BEGIN + 9250 "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ, Ð½Ð¾Ð¼ÐµÑÐµ Ð²ÐµÑÑÐ¸Ð¸ Ð¸ Ð°Ð²ÑÐ¾ÑÑÐºÐ¸Ñ Ð¿ÑÐ°Ð²Ð°Ñ." + 9252 "ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð´Ð»Ñ Ð¾ÑÐ»Ð°Ð´ÐºÐ¸." +END + +STRINGTABLE +BEGIN + 9281 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° Ð¿ÑÐµÐ´ÑÐ´ÑÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." + 9282 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° ÑÐ»ÐµÐ´ÑÑÑÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." + 9283 "ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸." + 9285 "ÐÐµÑÐµÐ¹ÑÐ¸ Ð½Ð° Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ." +END + +STRINGTABLE +BEGIN + 9362 "ÐÑÐºÑÑÑÑ Ð¿Ð°Ð¿ÐºÑ ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ." + 9363 "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ." +END + +STRINGTABLE +BEGIN + 9505 "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸Ð»Ð¸ ÑÐ¿ÑÑÑÐ°ÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸." + 9506 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ ÑÑÑÐ¾ÐºÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ñ." + 9508 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¾Ð±ÑÑÐ½ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÐ¸." + 9509 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð°Ð´ÑÐµÑÐ½ÑÑ ÑÑÑÐ¾ÐºÑ." + 9510 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ ÑÑÑÐ»Ð¾Ðº." + 9516 "ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²." +END + +STRINGTABLE +BEGIN + 9533 "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÐ¾Ð²." +END + +STRINGTABLE +BEGIN + 9552 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¸Ð»Ð¸ ÑÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ" + 9553 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¿Ð¾Ð¸ÑÐºÐ°" + 9554 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸Ð·Ð±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾" + 9555 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¸ÑÑÐ¾ÑÐ¸Ð¸" + 9557 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¿Ð°Ð¿Ð¾Ðº" + 9559 "ÐÑÐ¾Ð±ÑÐ°Ð·Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¼ÐµÐ´Ð¸Ð°" +END + +STRINGTABLE +BEGIN + IDS_SMALLICONS "ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" + IDS_LARGEICONS "ÐÑÑÐ¿Ð½ÑÐµ Ð·Ð½Ð°ÑÐºÐ¸" + IDS_SHOWTEXTLABELS "Ð¢ÐµÐºÑÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸" +END + +STRINGTABLE +BEGIN + IDS_NOTEXTLABELS "ÐÐµÐ· Ð¿Ð¾Ð´Ð¿Ð¸ÑÐµÐ¹ Ðº ÐºÐ½Ð¾Ð¿ÐºÐ°Ð¼" + IDS_SELECTIVETEXTONRIGHT "ÐÑÐ±Ð¾ÑÐ¾ÑÐ½Ð¾ ÑÐµÐºÑÑ ÑÐ¿ÑÐ°Ð²Ð°" +END + +STRINGTABLE +BEGIN + IDS_GOBUTTONLABEL "|ÐÐµÑÐµÑÐ¾Ð´||" + IDS_GOBUTTONTIPTEMPLATE "ÐÐµÑÐµÐ¹ÑÐ¸ Ð² ""%s""" +END + +STRINGTABLE +BEGIN + IDS_SEARCHLABEL "ÐÐ¾Ð¸ÑÐº" + IDS_ADDRESSBANDLABEL "Ð&Ð´ÑÐµÑ" +END + +STRINGTABLE +BEGIN + IDS_FOLDERSLABEL "ÐÐ°Ð¿ÐºÐ¸" +END + +STRINGTABLE +BEGIN + IDS_HISTORYTEXT "&ÐÑÑÐ¾ÑÐ¸Ñ\tCtrl+H" +END + +STRINGTABLE +BEGIN + IDS_UP "ÐÐ²ÐµÑÑ" +END + +STRINGTABLE +BEGIN + IDS_BACK "ÐÐ°Ð·Ð°Ð´" + IDS_FORWARD "ÐÐ¿ÐµÑÐµÐ´" +END + + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|ÐÐ°Ð·Ð°Ð´|ÐÐ¿ÐµÑÐµÐ´|ÐÐ²ÐµÑÑ|ÐÐ¾Ð¸ÑÐº|ÐÐ°Ð¿ÐºÐ¸|ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð²|ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð²|Ð£Ð´Ð°Ð»Ð¸ÑÑ|ÐÑÐ¼ÐµÐ½Ð¸ÑÑ|ÐÐ¸Ð´|ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ|ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ|ÐÐ¾Ð¼Ð¾Ð¹|ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ Ð´Ð¸ÑÐº|ÐÑÐºÐ»ÑÑÐ¸ÑÑ|ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ|ÐÑÑÐ½Ð°Ð»|ÐÐ¾ Ð²ÐµÑÑ ÑÐºÑÐ°Ð½|Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°|ÐÑÑÐµÐ·Ð°ÑÑ|ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ|ÐÑÑÐ°Ð²Ð¸ÑÑ|Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸||" +END

9 years, 10 months

[dquintana] 65772: [BROWSEUI] * Do not enable the CExplorerBand wrapper by default. Avoids crashing due to a stack overflow. CORE-8930 #resolve #comment Oops. Fixed in r65772. Thanks.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Dec 20 18:10:02 2014 New Revision: 65772 URL: http://svn.reactos.org/svn/reactos?rev=65772&view=rev Log: [BROWSEUI] * Do not enable the CExplorerBand wrapper by default. Avoids crashing due to a stack overflow. CORE-8930 #resolve #comment Oops. Fixed in r65772. Thanks. Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Sat Dec 20 18:10:02 2014 @@ -13,19 +13,9 @@ } CExplorerBand::CExplorerBand() : - m_internalBand(NULL), - m_internalDeskBand(NULL), - m_internalObjectWithSite(NULL), - m_internalInputObject(NULL), - m_internalPersistStream(NULL), - m_internalOleCommandTarget(NULL), - m_internalServiceProvider(NULL), - m_internalBandNavigate(NULL), - m_internalWinEventHandler(NULL), - m_internalNamespaceProxy(NULL), - m_internalDispatch(NULL), m_OnWinEventShown(FALSE) { +#if 0 HRESULT hResult = CoCreateInstance(CLSID_ExplorerBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &m_internalBand)); if (FAILED(hResult)) { @@ -158,6 +148,7 @@ m_internalDispatch = NULL; return; } +#endif } CExplorerBand::~CExplorerBand()

9 years, 10 months

[gadamopoulos] 65771: [SHELL32] * Properly stub CheckStagingArea which is used by native explorer

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Dec 20 18:06:42 2014 New Revision: 65771 URL: http://svn.reactos.org/svn/reactos?rev=65771&view=rev Log: [SHELL32] * Properly stub CheckStagingArea which is used by native explorer Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sat Dec 20 18:06:42 2014 @@ -460,7 +460,7 @@ 750 stub SHGetAttributesFromDataObject 751 stub -noname SHSimulateDropOnClsid 752 stub -noname SHGetComputerDisplayNameW -753 stub -noname CheckStagingArea +753 stdcall -noname CheckStagingArea() 754 stub -noname SHLimitInputEditWithFlags 755 stdcall -noname PathIsEqualOrSubFolder(wstr wstr) 756 stub -noname DeleteFileThumbnail Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Sat Dec 20 18:06:42 2014 @@ -1395,3 +1395,10 @@ FIXME("SHGetUserSessionId() stub\n"); return NULL; } + +EXTERN_C +DWORD WINAPI CheckStagingArea(VOID) +{ + /* Called by native explorer */ + return 0; +}

9 years, 10 months

[gadamopoulos] 65770: [RPCSS] * Create ScmCreatedEvent when we are done initializing.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Dec 20 17:56:00 2014 New Revision: 65770 URL: http://svn.reactos.org/svn/reactos?rev=65770&view=rev Log: [RPCSS] * Create ScmCreatedEvent when we are done initializing. Modified: trunk/reactos/base/services/rpcss/rpcss_main.c Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Sat Dec 20 17:56:00 2014 @@ -98,6 +98,10 @@ exit_event = __wine_make_process_system(); #else exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires + { + HANDLE hStartEvent = CreateEventW(NULL, TRUE, FALSE, L"ScmCreatedEvent"); + SetEvent(hStartEvent); + } #endif return TRUE;

9 years, 10 months

[dquintana] 65769: [RSHELL] * Make the shell menus focus the parent before displaying themselves. Fixes keyboard focus when opening the start menu with the windows key. NOTE: I put this in the focu...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Dec 20 17:45:45 2014 New Revision: 65769 URL: http://svn.reactos.org/svn/reactos?rev=65769&view=rev Log: [RSHELL] * Make the shell menus focus the parent before displaying themselves. Fixes keyboard focus when opening the start menu with the windows key. NOTE: I put this in the focus manager for lack of a better place, but it may not be how Windows does it. Modified: trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp trunk/reactos/base/shell/rshell/CMenuFocusManager.h Modified: trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Sat Dec 20 17:45:45 2014 @@ -163,6 +163,7 @@ m_isLButtonDown(FALSE), m_movedSinceDown(FALSE), m_windowAtDown(NULL), + m_PreviousForeground(NULL), m_bandCount(0), m_menuDepth(0) { @@ -704,7 +705,14 @@ m_current = NULL; if (!m_current || m_current->type != MenuPopupEntry) + { SetMenuCapture(NULL); + if (old && old->type == MenuPopupEntry && m_PreviousForeground) + { + ::SetForegroundWindow(m_PreviousForeground); + m_PreviousForeground = NULL; + } + } if (m_current && m_current->type != TrackedMenuEntry) { @@ -771,10 +779,24 @@ hr = topMenu->mb->GetSite(IID_PPV_ARG(IServiceProvider, &bandSite)); hr = bandSite->QueryService(SID_SMenuBandParent, IID_PPV_ARG(IOleWindow, &deskBar)); + CComPtr<IOleWindow> deskBarSite; + hr = IUnknown_GetSite(deskBar, IID_PPV_ARG(IOleWindow, &deskBarSite)); + + // FIXME: Find the correct place for this + HWND hWndOwner; + deskBarSite->GetWindow(&hWndOwner); + + m_PreviousForeground = ::GetForegroundWindow(); + if (m_PreviousForeground != hWndOwner) + ::SetForegroundWindow(hWndOwner); + else + m_PreviousForeground = NULL; + // Get the HWND of the top-level window HWND hWndSite; hr = deskBar->GetWindow(&hWndSite); SetMenuCapture(hWndSite); + } if (!m_parent || m_parent->type == MenuBarEntry) Modified: trunk/reactos/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Sat Dec 20 17:45:45 2014 @@ -81,6 +81,8 @@ BOOL m_movedSinceDown; HWND m_windowAtDown; + HWND m_PreviousForeground; + // TODO: make dynamic #define MAX_RECURSE 20 StackEntry m_bandStack[MAX_RECURSE];

9 years, 10 months

[pschweitzer] 65768: [EXPLORER] Complete the French translation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 20 17:28:03 2014 New Revision: 65768 URL: http://svn.reactos.org/svn/reactos?rev=65768&view=rev Log: [EXPLORER] Complete the French translation Modified: trunk/reactos/base/shell/explorer/lang/fr-FR.rc Modified: trunk/reactos/base/shell/explorer/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/f… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/fr-FR.rc [iso-8859-1] Sat Dec 20 17:28:03 2014 @@ -64,69 +64,69 @@ IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Taskbar" +CAPTION "Barre des tÃ¢ches" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Apparence de la barre des tÃ¢ches", IDC_STATIC, 6, 6, 240, 104 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13, 18, 224, 21 - AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 - AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 - AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 - AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 - AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "&Verrouiller la barre des tÃ¢ches", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 + AUTOCHECKBOX "&Cacher a&utomatique la barre des tÃ¢ches", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 + AUTOCHECKBOX "Garder la barre des &tÃ¢ches au-dessus des autres fenÃªtres", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "&Grouper les boutons similaires de la barre des tÃ¢ches", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 + AUTOCHECKBOX "Montrer la &zone de lancement rapide", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" +CAPTION "Menu dÃ©marrer" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 17, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 4, 53, 14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality", -1, 20, 57, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 44, 53, 14, WS_DISABLED - GROUPBOX "Privacy", IDC_STATIC, 7, 100, 238, 42 - AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED - AUTOCHECKBOX "Store and display a list of recently opened &programs", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED + AUTORADIOBUTTON "&Menu dÃ©marrer", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 + LTEXT "Ce style de menu vous donne un accÃ¨s rapide Ã vos dossiers, programmes favoris et Ã l'outil de recherche.", IDC_STATIC, 20, 17, 150, 24, WS_DISABLED + PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCUST, 192, 4, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Menu dÃ©marrer &classique", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED + LTEXT "Ce style de menu vous donne l'apparence et les fonctionnalitÃ©s classiques", -1, 20, 57, 150, 24, WS_DISABLED + PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 44, 53, 14, WS_DISABLED + GROUPBOX "Vie privÃ©e", IDC_STATIC, 7, 100, 238, 42 + AUTOCHECKBOX "Stocker et afficher une liste des &fichiers rÃ©cemment ouverts", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED + AUTOCHECKBOX "Stocker et afficher une liste des &programmes rÃ©cemment lancÃ©s", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Notification Area" +CAPTION "Zone de notifications" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 6, 238, 21, WS_DISABLED - GROUPBOX "Icons", IDC_STATIC, 6, 33, 240, 58, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16, WS_DISABLED - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14, WS_DISABLED - GROUPBOX "System icons", IDC_STATIC, 6, 97, 240, 84, WS_DISABLED - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 112, 223, 16, WS_DISABLED - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 126, 200, 10, WS_DISABLED + GROUPBOX "IcÃ´nes", IDC_STATIC, 6, 33, 240, 58, WS_DISABLED + LTEXT "Vous pouvez garder la zone de notification Ã©purÃ©e en cachant les icÃ´nes sur lesquelles vous n'avez pas cliquÃ© rÃ©cemment.", IDC_STATIC, 13, 48, 223, 16, WS_DISABLED + AUTOCHECKBOX "&Cacher les icÃ´nes inactives", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED + PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_ICONCUST, 188, 70, 53, 14, WS_DISABLED + GROUPBOX "IcÃ´nes du systÃ¨me", IDC_STATIC, 6, 97, 240, 84, WS_DISABLED + LTEXT "SÃ©lectionner les icÃ´nes du systÃ¨me Ã toujours afficher.", IDC_STATIC, 13, 112, 223, 16, WS_DISABLED + AUTOCHECKBOX "&Horloge", IDC_TASKBARPROP_CLOCK, 13, 126, 200, 10, WS_DISABLED AUTOCHECKBOX "&Volume", IDC_TASKBARPROP_VOLUME, 13, 139, 200, 10, WS_DISABLED - AUTOCHECKBOX "&Network", IDC_TASKBARPROP_NETWORK, 13, 152, 200, 10, WS_DISABLED - AUTOCHECKBOX "&Power", IDC_TASKBARPROP_POWER, 13, 164, 200, 10, WS_DISABLED + AUTOCHECKBOX "&RÃ©seau", IDC_TASKBARPROP_NETWORK, 13, 152, 200, 10, WS_DISABLED + AUTOCHECKBOX "&Alimentation", IDC_TASKBARPROP_POWER, 13, 164, 200, 10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbars" +CAPTION "Barres d'outils" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7, 7, 223, 12, WS_DISABLED + LTEXT "SÃ©lectionner les barres d'outils Ã ajouter dans la barre des tÃ¢ches.", IDC_STATIC, 7, 7, 223, 12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32", WS_BORDER | WS_TABSTOP | WS_DISABLED, 7, 20, 236, 160, WS_EX_CLIENTEDGE END IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Advanced" +CAPTION "AvancÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6, 6, 240, 121 - AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 - AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 + GROUPBOX "Options avancÃ©es", IDC_STATIC, 6, 6, 240, 121 + AUTOCHECKBOX "Afficher les &secondes", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 + AUTOCHECKBOX "Afficher les &aperÃ§us des fenÃªtres (miniatures)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 END STRINGTABLE @@ -135,10 +135,10 @@ IDS_PROPERTIES "P&ropriÃ©tÃ©s" IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs" IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "Le systÃ¨me ne peut pas dÃ©marrer explorer parce que le registre est corrompu ou indisponible." END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barrre des tÃ¢ches et menu dÃ©marrer" END

9 years, 10 months

[akhaldi] 65767: [COMCTL32] Properly highlight r65766.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 20 16:55:10 2014 New Revision: 65767 URL: http://svn.reactos.org/svn/reactos?rev=65767&view=rev Log: [COMCTL32] Properly highlight r65766. Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Dec 20 16:55:10 2014 @@ -244,9 +244,9 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { -#if 0 +#ifndef __REACTOS__ return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); -#else +#else /* r65766 */ /* This is the behaviour in comctl32 v6 */ return 0; #endif

9 years, 10 months

[gadamopoulos] 65766: [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We do...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Dec 20 16:49:31 2014 New Revision: 65766 URL: http://svn.reactos.org/svn/reactos?rev=65766&view=rev Log: [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We don't have a proper solution for these differences in behavior and since we already opt to use the v6 behavior I think it is fine. CORE-5483 #resolve #comment Committed a slightly different version of the patch, thanks. Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Dec 20 16:49:31 2014 @@ -244,7 +244,12 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { +#if 0 return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); +#else + /* This is the behaviour in comctl32 v6 */ + return 0; +#endif } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)

9 years, 10 months

[dquintana] 65765: [SHELL32] * Remove a leftover from when this file was C++. CORE-8846 #resolve #comment Should be fixed in trunk r65765, thanks.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Dec 20 16:47:35 2014 New Revision: 65765 URL: http://svn.reactos.org/svn/reactos?rev=65765&view=rev Log: [SHELL32] * Remove a leftover from when this file was C++. CORE-8846 #resolve #comment Should be fixed in trunk r65765, thanks. Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Sat Dec 20 16:47:35 2014 @@ -385,9 +385,6 @@ tvi.lParam = (LPARAM)lptvid; IShellFolder_AddRef(lpsf); -#ifdef __REACTOS__ - IEnumIDList_AddRef(pEnumIL); -#endif lptvid->lpsfParent = lpsf; lptvid->lpi = ILClone(pidl); lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl);

9 years, 10 months

[pschweitzer] 65764: [TREE] - Fix tree internal name - Add tree French translation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 20 16:41:23 2014 New Revision: 65764 URL: http://svn.reactos.org/svn/reactos?rev=65764&view=rev Log: [TREE] - Fix tree internal name - Add tree French translation Added: trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc Added: trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc [iso-8859-1] Sat Dec 20 16:41:23 2014 @@ -0,0 +1,12 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Affiche graphiquement la structure des dossiers d'un lecteur ou d'un chemin.\n\n\ +TREE [lecteur:][chemin] [/F] [/A]\n\n\ +\t/F Affiche le nom des fichiers dans chaque dossier.\n\ +\t/A Utiliser l'ASCII au lieu de l'unicode.\n" + IDS_NO_SUBDIRECTORIES "Aucun sous-rÃ©pertoire n'existe" + IDS_FOLDER_PATH "ÃnumÃ©ration du dossier\n" + IDS_VOL_SERIAL "Le numÃ©ro de sÃ©rie du volume est %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Sat Dec 20 16:41:23 2014 @@ -7,7 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tree Walk Utility" #define REACTOS_STR_INTERNAL_NAME "tree" -#define REACTOS_STR_ORIGINAL_FILENAME "tree.exe" +#define REACTOS_STR_ORIGINAL_FILENAME "tree.com" #include <reactos/version.rc> /* UTF-8 */ @@ -18,3 +18,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif

9 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
39
Older →

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 December 2014