Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66811: [CLT2015] Grab r66810 (Drive's properties Tools tab improvements).
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 13:51:27 2015 New Revision: 66811 URL: http://svn.reactos.org/svn/reactos?rev=66811&view=rev Log: [CLT2015] Grab r66810 (Drive's properties Tools tab improvements). Added: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/res/icons/165.ico - copied unchanged from r66810, trunk/reactos/dll/win32/shell32/res/icons/165.ico branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/res/icons/166.ico - copied unchanged from r66810, trunk/reactos/dll/win32/shell32/res/icons/166.ico branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/res/icons/167.ico - copied unchanged from r66810, trunk/reactos/dll/win32/shell32/res/icons/167.ico Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ (props changed) branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/dialogs/filedefext.cpp branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/icon_res.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/bg-BG.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ca-ES.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/cs-CZ.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/da-DK.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/de-DE.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/el-GR.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-GB.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-US.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/es-ES.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fi-FI.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fr-FR.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/he-IL.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/hu-HU.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/it-IT.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ja-JP.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ko-KR.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/nl-NL.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/no-NO.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pl-PL.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-BR.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-PT.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ro-RO.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ru-RU.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sk-SK.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sl-SI.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sq-AL.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sv-SE.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/tr-TR.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/uk-UA.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-CN.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-TW.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/shresdef.h Propchange: branches/ReactOS-0.3.17-CLT2015/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 13:51:27 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:66727-66770,66776-66779,66795 +/trunk/reactos:66727-66770,66776-66779,66795,66810 Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/dialogs/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/dialogs/filedefext.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/dialogs/filedefext.cpp [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -240,32 +240,20 @@ * * SH_CreatePropertySheetPage [Internal] * - * creates a property sheet page from an resource name + * creates a property sheet page from a resource id * */ HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle) { - HRSRC hRes = FindResourceW(shell32_hInstance, MAKEINTRESOURCEW(wDialogId), (LPWSTR)RT_DIALOG); - if (hRes == NULL) - { - ERR("failed to find resource id\n"); - return NULL; - } - - LPVOID pTemplate = LoadResource(shell32_hInstance, hRes); - if (pTemplate == NULL) - { - ERR("failed to load resource\n"); - return NULL; - } - PROPSHEETPAGEW Page; + memset(&Page, 0x0, sizeof(PROPSHEETPAGEW)); Page.dwSize = sizeof(PROPSHEETPAGEW); - Page.dwFlags = PSP_DLGINDIRECT; - Page.pResource = (DLGTEMPLATE*)pTemplate; + Page.dwFlags = PSP_DEFAULT; + Page.hInstance = shell32_hInstance; + Page.pszTemplate = MAKEINTRESOURCE(wDialogId); Page.pfnDlgProc = pfnDlgProc; Page.lParam = lParam; Page.pszTitle = pwszTitle; Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -59,7 +59,10 @@ IDI_SHELL_FONT_FILE2 ICON "res/icons/157.ico" IDI_SHELL_RUN2 ICON "res/icons/160.ico" IDI_SHELL_CONFIRM_DELETE ICON "res/icons/161.ico" -/* TODO: 165.ico, 166.ico, 167.ico, 168.ico, 169.ico, 170.ico, 171.ico */ +IDI_SHELL_TOOLS_BACKUP ICON "res/icons/165.ico" +IDI_SHELL_TOOLS_CHKDSK ICON "res/icons/166.ico" +IDI_SHELL_TOOLS_DEFRAG ICON "res/icons/167.ico" +/* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" /* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð·Ð° Ð³ÑÐµÑÐºÐ¸", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ð¢Ð¾Ð·Ð¸ Ð¸Ð·Ð±Ð¾Ñ ÑÐµ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ ÑÐ¾Ð¼Ð° Ð·Ð° Ð³ÑÐµÑÐºÐ¸.", -1, 40, 25, 160, 20 PUSHBUTTON "ÐÑÐ¾Ð²ÐµÑÐ¸ Ð²ÐµÐ´Ð½Ð°Ð³Ð°...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "ÐÐ¾Ð´ÑÐµÐ¶Ð´Ð°Ð½Ðµ", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ð¢Ð¾Ð·Ð¸ Ð¸Ð·Ð±Ð¾Ñ ÑÐµ Ð¿Ð¾Ð´ÑÐµÐ´Ð¸ (Ð´ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¸ÑÐ°) ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð½Ð° ÑÐ¾Ð¼Ð°", -1, 40, 85, 160, 20 PUSHBUTTON "ÐÐ¾Ð´ÑÐµÐ´Ð¸ Ð²ÐµÐ´Ð½Ð°Ð³Ð°...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ÐÐ°Ð¿Ð°ÑÑÐ²Ð°Ð½Ðµ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ð¢Ð¾Ð·Ð¸ Ð¸Ð·Ð±Ð¾Ñ ÑÐµ Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ Ð·Ð°Ð¿Ð°ÑÐ½Ð¾ ÑÑÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð½Ð° Ð´Ð¸ÑÐºÐ°.", -1, 40, 150, 160, 20 PUSHBUTTON "ÐÐ°Ð¿Ð°ÑÐ¸ Ð²ÐµÐ´Ð½Ð°Ð³Ð°", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -334,12 +334,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kontrola chyb", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Tento nÃ¡stroj otestuje svazek na chyby.", -1, 40, 25, 160, 20 PUSHBUTTON "Zkontrolovat...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentace", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Tento nÃ¡stroj zdefragmentuje soubory na svazku", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmentovat...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ZÃ¡loha", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "TÃmto nÃ¡strojem zazÃ¡lohuje soubory na svazku.", -1, 40, 150, 160, 20 PUSHBUTTON "ZÃ¡lohovat...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -334,12 +334,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "FehlerÃ¼berprÃ¼fung", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Bei Wahl dieser Option wird der DatentrÃ¤ger\nauf Fehler Ã¼berprÃ¼ft.", -1, 40, 25, 160, 20 PUSHBUTTON "Jetzt &prÃ¼fen...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem DatentrÃ¤ger defragmentiert.", -1, 40, 85, 160, 20 PUSHBUTTON "Jetzt &defragmentieren...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sicherung", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Bei Wahl dieser Option werden die auf dem\nDatentrÃ¤ger gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20 PUSHBUTTON "Jetzt &sichern...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÎÎ»ÎµÎ³ÏÎ¿Ï ÏÏÎ±Î»Î¼Î¬ÏÏÎ½", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± ÎµÎ»ÎÎ³Î¾ÎµÎ¹ ÏÎ¿Î½\nÏÏÎ¼Î¿ Î³Î¹Î± ÏÏÎ¬Î»Î¼Î±ÏÎ±.", -1, 40, 25, 160, 20 PUSHBUTTON "Î&Î»ÎµÎ³ÏÎ¿Ï...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "ÎÎ½Î±ÏÏÎ³ÎºÏÏÏÎ·ÏÎ·", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± Î±Î½Î±ÏÏÎ³ÎºÏÎ¿ÏÎ®ÏÎµÎ¹ ÏÎ±\nÎ±ÏÏÎµÎ¯Î± ÏÎµ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ¼Î¿", -1, 40, 85, 160, 20 PUSHBUTTON "&ÎÎ½Î±ÏÏÎ³ÎºÏÏÏÎ·ÏÎ·...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ÎÎ½ÏÎ¯Î³ÏÎ±ÏÎ± Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î±Î½ÏÎ¯Î³ÏÎ±ÏÎ±\nÏÏÎ±Î»ÎµÎ¯Î±Ï Î³Î¹Î± ÏÎ± Î±ÏÏÎµÎ¯Î± Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ¼Î¿Ï.", -1, 40, 150, 160, 20 PUSHBUTTON "ÎÎ½ÏÎ¯Î³ÏÎ±ÏÎ± Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -329,12 +329,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ComprobaciÃ³n de errores ", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Esta opciÃ³n comprobarÃ¡ los errores en la\nunidad.", -1, 40, 25, 160, 20 PUSHBUTTON "Comprobar ahora...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DesfragmentaciÃ³n ", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opciÃ³n desfragmentarÃ¡ los archivos en esta\nunidad.", -1, 40, 85, 160, 20 PUSHBUTTON "Desfragmentar ahora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Copia de seguridad ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opciÃ³n realizarÃ¡ una copia de seguridad de\nlos archivos almacenados en la unidad.", -1, 40, 150, 160, 20 PUSHBUTTON "Realizar copia de seguridad ahora...", 14002, 90, 170, 130, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "VÃ©rification d'erreurs", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Cette option vÃ©rifiera le volume pour Ã©viter les\nerreurs.", -1, 40, 25, 160, 20 PUSHBUTTON "VÃ©rifier maintenant...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DÃ©fragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Cette option va dÃ©fragmenter les fichiers sur ce volume", -1, 40, 85, 160, 20 PUSHBUTTON "DÃ©fragmenter maintenant...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sauvegarde", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Cette option va sauvegarder les fichiers sur le volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Sauvegarder maintenant...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "××××§×ª ×©×××××ª", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "××××§ ××¢×ª...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "×××××", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "××× ××¢×ª...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "×××××", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "××× ××¢×ª...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Controllo errori", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Questa opzione controllerÃ questo volume\nper verificare l'assenza di errori.", -1, 40, 25, 160, 20 PUSHBUTTON "Controlla...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Deframmentazione", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Questa opzione deframmenterÃ i file di questo volume", -1, 40, 85, 160, 20 PUSHBUTTON "Deframmenta...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Salvataggio", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Questa opzione effettuerÃ un salvataggio dei file del volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Salvataggio...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "ã¨ã©ã¼ãã§ãã¯", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ãã®ãªãã·ã§ã³ã¯ããªã¥ã¼ã ã¨ã©ã¼ããã§ãã¯ãã¾ãã", -1, 40, 25, 160, 20 PUSHBUTTON "ããã«ãã§ãã¯...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "æé©å", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ãã®ãªãã·ã§ã³ã¯ãã®ããªã¥ã¼ã ã®ãã¡ã¤ã«ãæé©åãã¾ã", -1, 40, 85, 160, 20 PUSHBUTTON "ããã«æé©å...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ããã¯ã¢ãã", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ãã®ãªãã·ã§ã³ã¯ãã®ããªã¥ã¼ã ã®ãã¡ã¤ã«ãããã¯ã¢ãããã¾ãã", -1, 40, 150, 160, 20 PUSHBUTTON "ããã«ããã¯ã¢ãã...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "FeilsÃ¸king", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Dette alternativet vil kontrollere volumet for \nfeil.", -1, 40, 25, 160, 20 PUSHBUTTON "Kontroller nÃ¥...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentering", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Dette alternativet defragmenterer filene pÃ¥ volumet.", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmenter nÃ¥...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sikkerhetskopi", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Dette alternativet tar sikkerhetskopi av filene pÃ¥ volumet.", -1, 40, 150, 160, 20 PUSHBUTTON "Ta sikkerhetskopi...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Sprawdzanie bÅÄdÃ³w", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu bÅÄdÃ³w.", -1, 40, 25, 160, 20 PUSHBUTTON "SprawdÅº...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentacja", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ta opcja dokona defragmentacji plikÃ³w woluminu.", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmentuj...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Kopia zapasowa", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ta opcja wykona kopiÄ zapasowÄ plikÃ³w tego woluminu.", -1, 40, 150, 160, 20 PUSHBUTTON "Wykonaj kopiÄ zapasowÄ...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "AnÃ¡lise de erros", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Esta opÃ§Ã£o irÃ¡ analisar erros no\nvolume.", -1, 40, 25, 160, 20 PUSHBUTTON "Analisar Agora...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DesfragmentaÃ§Ã£o", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opÃ§Ã£o irÃ¡ desfragmentar os arquivos no volume", -1, 40, 85, 160, 20 PUSHBUTTON "Desfragmentar Agora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opÃ§Ã£o irÃ¡ realizar o backup de arquivos no volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Fazer Backup Agora...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Verificar por erros...", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Esta opÃ§Ã£o vai verificar o volume por erros.", -1, 40, 25, 160, 20 PUSHBUTTON "Verificar agora...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DesfragmentaÃ§Ã£o", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opÃ§Ã£o vai desfragmentar os ficheiros no volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmentar Agora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "CÃ³pia de seguranÃ§a", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opÃ§Ã£o vai criar os ficheiros do volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Executar CÃ³pia de SeguranÃ§a...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -330,12 +330,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Verificarea erorilor", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "AceastÄ opÈiune va verifica acest volum pentru eventuale erori Ã®n sistemul de fiÈiere.", -1, 40, 25, 180, 20 PUSHBUTTON "&Verificareâ¦", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "&Defragmentare", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "AceastÄ opÈiune presupune ordonarea fragmentelor de fiÈiere pentru a Ã®mbunÄtÄÈi viteza de citire.", -1, 40, 85, 180, 20 PUSHBUTTON "Defragmentareâ¦", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Copie de rezervÄ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "AceastÄ opÈiune va crea o copie de siguranÈÄ a fiÈierelor de pe aceastÄ partiÈie.", -1, 40, 150, 180, 20 PUSHBUTTON "&Creare rezervÄâ¦", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -330,12 +330,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð´Ð¸ÑÐºÐ°", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐ¾Ð¼Ð° Ð½Ð° Ð½Ð°Ð»Ð¸ÑÐ¸Ðµ Ð¾ÑÐ¸Ð±Ð¾Ðº.", -1, 40, 25, 160, 20 PUSHBUTTON "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ &Ð¿ÑÐ¾Ð²ÐµÑÐºÑ...", 14000, 110, 45, 120, 15, WS_TABSTOP GROUPBOX "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð´Ð¸ÑÐºÐ°", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÐ°Ð½ÑÑÐ¸ÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼ ÑÐ¾Ð¼Ðµ.", -1, 40, 85, 160, 20 PUSHBUTTON "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð´&ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ...", 14001, 110, 105, 120, 15, WS_TABSTOP GROUPBOX "ÐÑÑÐ¸Ð²Ð°ÑÐ¸Ñ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ÐÑÑÐ¸Ð²Ð°ÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÐ°Ð½ÑÑÐ¸ÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼ ÑÐ¾Ð¼Ðµ.", -1, 40, 150, 160, 20 PUSHBUTTON "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ &Ð°ÑÑÐ¸Ð²Ð°ÑÐ¸Ñ...", 14002, 110, 170, 120, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kontrola chÃ½b", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "UmoÅ¾Åuje nÃ¡jsÅ¥ chyby na zvÃ¤zku.", -1, 40, 25, 160, 20 PUSHBUTTON "&SkontrolovaÅ¥...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DefragmentÃ¡cia", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Defragmentuje sÃºbory na zvÃ¤zku.", -1, 40, 85, 160, 20 PUSHBUTTON "&DefragmentovaÅ¥...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ZÃ¡lohovanie", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ZÃ¡lohuje sÃºbory na zvÃ¤zku.", -1, 40, 150, 160, 20 PUSHBUTTON "&ZÃ¡lohovaÅ¥...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -332,12 +332,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Bagim-kontroll", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ky opsion do tÃ« kontrollojÃ« volumin pÃ«r\ngabime.", -1, 40, 25, 160, 20 PUSHBUTTON "Kontrollo tani...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentacion", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ky opsion do tÃ« defragmentojÃ« dokumentat nga vÃ«llimi", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmento Tani...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Rezervat", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ky opsion do tÃ« ruaj/rezervoj dokumentat nga vÃ«llimi.", -1, 40, 150, 160, 20 PUSHBUTTON "Rezerv Tani...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Hata denetimi", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Bu seÃ§enek sÃ¼rÃ¼cÃ¼deki hatalarÄ± denetler.", -1, 40, 25, 160, 20 PUSHBUTTON "Åimdi &Denetle...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Disk BirleÅtirme", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Bu seÃ§enek sÃ¼rÃ¼cÃ¼deki dosyalarÄ± birleÅtirir.", -1, 40, 85, 160, 20 PUSHBUTTON "Åimdi &BirleÅtir...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Yedekleme", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Bu seÃ§enek sÃ¼rÃ¼cÃ¼deki dosyalarÄ± yedekler.", -1, 40, 150, 160, 20 PUSHBUTTON "Åi&mdi Yedekle...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÐµÑÐµÐ²ÑÑÐºÐ° Ð´Ð¸ÑÐºÑ", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ÐÐµÑÐµÐ²ÑÑÐºÐ° ÑÐ¾Ð¼Ñ Ð½Ð° Ð½Ð°ÑÐ²Ð½ÑÑÑÑ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº.", -1, 40, 25, 160, 20 PUSHBUTTON "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð¿ÐµÑÐµÐ²ÑÑÐºÑ...", 14000, 125, 45, 100, 15, WS_TABSTOP GROUPBOX "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ Ð´Ð¸ÑÐºÑ", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ ÑÐ°Ð¹Ð»ÑÐ² Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐ¾Ð¼Ñ", -1, 40, 85, 160, 20 PUSHBUTTON "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð´ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ...", 14001, 125, 105, 100, 15, WS_TABSTOP GROUPBOX "ÐÑÑÑÐ²Ð°ÑÑÑ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ð ÐµÐ·ÐµÑÐ²Ð½Ðµ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»ÑÐ² Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐ¾Ð¼Ñ.", -1, 40, 150, 160, 20 PUSHBUTTON "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð°ÑÑÑÐ²Ð°ÑÑÑ...", 14002, 125, 170, 100, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -337,12 +337,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -336,12 +336,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Mar 19 13:51:27 2015 @@ -372,7 +372,10 @@ #define IDI_SHELL_FONT_FILE2 157 #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 -/* TODO: 165.ico, 166.ico, 167.ico, 168.ico, 169.ico, 170.ico, 171.ico */ +#define IDI_SHELL_TOOLS_BACKUP 165 +#define IDI_SHELL_TOOLS_CHKDSK 166 +#define IDI_SHELL_TOOLS_DEFRAG 167 +/* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES2 173 /* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */

1 0

[khornicek] 66810: [SHELL32] - add icons 165, 166 (by Robert Naumann) and 167 (adapted regedit icon by me) and add these to the Drive's properties Tools tab (patch by Robert Naumann) - use the dial...
by khornicek＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: khornicek Date: Thu Mar 19 13:48:10 2015 New Revision: 66810 URL: http://svn.reactos.org/svn/reactos?rev=66810&view=rev Log: [SHELL32] - add icons 165, 166 (by Robert Naumann) and 167 (adapted regedit icon by me) and add these to the Drive's properties Tools tab (patch by Robert Naumann) - use the dialog resource id directly in SH_CreatePropertySheetPage (makes the icons actually draw) CORE-9382 Added: trunk/reactos/dll/win32/shell32/res/icons/165.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/166.ico (with props) trunk/reactos/dll/win32/shell32/res/icons/167.ico (with props) Modified: trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp trunk/reactos/dll/win32/shell32/icon_res.rc 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/ru-RU.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 trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp [iso-8859-1] Thu Mar 19 13:48:10 2015 @@ -240,32 +240,20 @@ * * SH_CreatePropertySheetPage [Internal] * - * creates a property sheet page from an resource name + * creates a property sheet page from a resource id * */ HPROPSHEETPAGE SH_CreatePropertySheetPage(WORD wDialogId, DLGPROC pfnDlgProc, LPARAM lParam, LPCWSTR pwszTitle) { - HRSRC hRes = FindResourceW(shell32_hInstance, MAKEINTRESOURCEW(wDialogId), (LPWSTR)RT_DIALOG); - if (hRes == NULL) - { - ERR("failed to find resource id\n"); - return NULL; - } - - LPVOID pTemplate = LoadResource(shell32_hInstance, hRes); - if (pTemplate == NULL) - { - ERR("failed to load resource\n"); - return NULL; - } - PROPSHEETPAGEW Page; + memset(&Page, 0x0, sizeof(PROPSHEETPAGEW)); Page.dwSize = sizeof(PROPSHEETPAGEW); - Page.dwFlags = PSP_DLGINDIRECT; - Page.pResource = (DLGTEMPLATE*)pTemplate; + Page.dwFlags = PSP_DEFAULT; + Page.hInstance = shell32_hInstance; + Page.pszTemplate = MAKEINTRESOURCE(wDialogId); Page.pfnDlgProc = pfnDlgProc; Page.lParam = lParam; Page.pszTitle = pwszTitle; Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Thu Mar 19 13:48:10 2015 @@ -59,7 +59,10 @@ IDI_SHELL_FONT_FILE2 ICON "res/icons/157.ico" IDI_SHELL_RUN2 ICON "res/icons/160.ico" IDI_SHELL_CONFIRM_DELETE ICON "res/icons/161.ico" -/* TODO: 165.ico, 166.ico, 167.ico, 168.ico, 169.ico, 170.ico, 171.ico */ +IDI_SHELL_TOOLS_BACKUP ICON "res/icons/165.ico" +IDI_SHELL_TOOLS_CHKDSK ICON "res/icons/166.ico" +IDI_SHELL_TOOLS_DEFRAG ICON "res/icons/167.ico" +/* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ IDI_SHELL_NETWORK_FOLDER ICON "res/icons/172.ico" IDI_SHELL_FAVORITES2 ICON "res/icons/173.ico" /* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */ 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð·Ð° Ð³ÑÐµÑÐºÐ¸", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ð¢Ð¾Ð·Ð¸ Ð¸Ð·Ð±Ð¾Ñ ÑÐµ Ð¿ÑÐ¾Ð²ÐµÑÐ¸ ÑÐ¾Ð¼Ð° Ð·Ð° Ð³ÑÐµÑÐºÐ¸.", -1, 40, 25, 160, 20 PUSHBUTTON "ÐÑÐ¾Ð²ÐµÑÐ¸ Ð²ÐµÐ´Ð½Ð°Ð³Ð°...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "ÐÐ¾Ð´ÑÐµÐ¶Ð´Ð°Ð½Ðµ", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ð¢Ð¾Ð·Ð¸ Ð¸Ð·Ð±Ð¾Ñ ÑÐµ Ð¿Ð¾Ð´ÑÐµÐ´Ð¸ (Ð´ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¸ÑÐ°) ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð½Ð° ÑÐ¾Ð¼Ð°", -1, 40, 85, 160, 20 PUSHBUTTON "ÐÐ¾Ð´ÑÐµÐ´Ð¸ Ð²ÐµÐ´Ð½Ð°Ð³Ð°...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ÐÐ°Ð¿Ð°ÑÑÐ²Ð°Ð½Ðµ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ð¢Ð¾Ð·Ð¸ Ð¸Ð·Ð±Ð¾Ñ ÑÐµ Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ Ð·Ð°Ð¿Ð°ÑÐ½Ð¾ ÑÑÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð½Ð° Ð´Ð¸ÑÐºÐ°.", -1, 40, 150, 160, 20 PUSHBUTTON "ÐÐ°Ð¿Ð°ÑÐ¸ Ð²ÐµÐ´Ð½Ð°Ð³Ð°", 14002, 130, 170, 90, 15, WS_TABSTOP END 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -334,12 +334,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kontrola chyb", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Tento nÃ¡stroj otestuje svazek na chyby.", -1, 40, 25, 160, 20 PUSHBUTTON "Zkontrolovat...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentace", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Tento nÃ¡stroj zdefragmentuje soubory na svazku", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmentovat...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ZÃ¡loha", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "TÃmto nÃ¡strojem zazÃ¡lohuje soubory na svazku.", -1, 40, 150, 160, 20 PUSHBUTTON "ZÃ¡lohovat...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -334,12 +334,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "FehlerÃ¼berprÃ¼fung", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Bei Wahl dieser Option wird der DatentrÃ¤ger\nauf Fehler Ã¼berprÃ¼ft.", -1, 40, 25, 160, 20 PUSHBUTTON "Jetzt &prÃ¼fen...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem DatentrÃ¤ger defragmentiert.", -1, 40, 85, 160, 20 PUSHBUTTON "Jetzt &defragmentieren...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sicherung", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Bei Wahl dieser Option werden die auf dem\nDatentrÃ¤ger gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20 PUSHBUTTON "Jetzt &sichern...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÎÎ»ÎµÎ³ÏÎ¿Ï ÏÏÎ±Î»Î¼Î¬ÏÏÎ½", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± ÎµÎ»ÎÎ³Î¾ÎµÎ¹ ÏÎ¿Î½\nÏÏÎ¼Î¿ Î³Î¹Î± ÏÏÎ¬Î»Î¼Î±ÏÎ±.", -1, 40, 25, 160, 20 PUSHBUTTON "Î&Î»ÎµÎ³ÏÎ¿Ï...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "ÎÎ½Î±ÏÏÎ³ÎºÏÏÏÎ·ÏÎ·", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± Î±Î½Î±ÏÏÎ³ÎºÏÎ¿ÏÎ®ÏÎµÎ¹ ÏÎ±\nÎ±ÏÏÎµÎ¯Î± ÏÎµ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ¼Î¿", -1, 40, 85, 160, 20 PUSHBUTTON "&ÎÎ½Î±ÏÏÎ³ÎºÏÏÏÎ·ÏÎ·...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ÎÎ½ÏÎ¯Î³ÏÎ±ÏÎ± Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ÎÏÏÎ® Î· ÎµÏÎ¹Î»Î¿Î³Î® Î¸Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î±Î½ÏÎ¯Î³ÏÎ±ÏÎ±\nÏÏÎ±Î»ÎµÎ¯Î±Ï Î³Î¹Î± ÏÎ± Î±ÏÏÎµÎ¯Î± Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÎ¼Î¿Ï.", -1, 40, 150, 160, 20 PUSHBUTTON "ÎÎ½ÏÎ¯Î³ÏÎ±ÏÎ± Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -329,12 +329,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ComprobaciÃ³n de errores ", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Esta opciÃ³n comprobarÃ¡ los errores en la\nunidad.", -1, 40, 25, 160, 20 PUSHBUTTON "Comprobar ahora...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DesfragmentaciÃ³n ", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opciÃ³n desfragmentarÃ¡ los archivos en esta\nunidad.", -1, 40, 85, 160, 20 PUSHBUTTON "Desfragmentar ahora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Copia de seguridad ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opciÃ³n realizarÃ¡ una copia de seguridad de\nlos archivos almacenados en la unidad.", -1, 40, 150, 160, 20 PUSHBUTTON "Realizar copia de seguridad ahora...", 14002, 90, 170, 130, 15, WS_TABSTOP END 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "VÃ©rification d'erreurs", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Cette option vÃ©rifiera le volume pour Ã©viter les\nerreurs.", -1, 40, 25, 160, 20 PUSHBUTTON "VÃ©rifier maintenant...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DÃ©fragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Cette option va dÃ©fragmenter les fichiers sur ce volume", -1, 40, 85, 160, 20 PUSHBUTTON "DÃ©fragmenter maintenant...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sauvegarde", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Cette option va sauvegarder les fichiers sur le volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Sauvegarder maintenant...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "××××§×ª ×©×××××ª", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "××××§ ××¢×ª...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "×××××", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "××× ××¢×ª...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "×××××", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "××× ××¢×ª...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Controllo errori", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Questa opzione controllerÃ questo volume\nper verificare l'assenza di errori.", -1, 40, 25, 160, 20 PUSHBUTTON "Controlla...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Deframmentazione", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Questa opzione deframmenterÃ i file di questo volume", -1, 40, 85, 160, 20 PUSHBUTTON "Deframmenta...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Salvataggio", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Questa opzione effettuerÃ un salvataggio dei file del volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Salvataggio...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "ã¨ã©ã¼ãã§ãã¯", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ãã®ãªãã·ã§ã³ã¯ããªã¥ã¼ã ã¨ã©ã¼ããã§ãã¯ãã¾ãã", -1, 40, 25, 160, 20 PUSHBUTTON "ããã«ãã§ãã¯...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "æé©å", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ãã®ãªãã·ã§ã³ã¯ãã®ããªã¥ã¼ã ã®ãã¡ã¤ã«ãæé©åãã¾ã", -1, 40, 85, 160, 20 PUSHBUTTON "ããã«æé©å...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ããã¯ã¢ãã", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ãã®ãªãã·ã§ã³ã¯ãã®ããªã¥ã¼ã ã®ãã¡ã¤ã«ãããã¯ã¢ãããã¾ãã", -1, 40, 150, 160, 20 PUSHBUTTON "ããã«ããã¯ã¢ãã...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "FeilsÃ¸king", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Dette alternativet vil kontrollere volumet for \nfeil.", -1, 40, 25, 160, 20 PUSHBUTTON "Kontroller nÃ¥...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentering", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Dette alternativet defragmenterer filene pÃ¥ volumet.", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmenter nÃ¥...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Sikkerhetskopi", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Dette alternativet tar sikkerhetskopi av filene pÃ¥ volumet.", -1, 40, 150, 160, 20 PUSHBUTTON "Ta sikkerhetskopi...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Sprawdzanie bÅÄdÃ³w", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu bÅÄdÃ³w.", -1, 40, 25, 160, 20 PUSHBUTTON "SprawdÅº...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentacja", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ta opcja dokona defragmentacji plikÃ³w woluminu.", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmentuj...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Kopia zapasowa", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ta opcja wykona kopiÄ zapasowÄ plikÃ³w tego woluminu.", -1, 40, 150, 160, 20 PUSHBUTTON "Wykonaj kopiÄ zapasowÄ...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "AnÃ¡lise de erros", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Esta opÃ§Ã£o irÃ¡ analisar erros no\nvolume.", -1, 40, 25, 160, 20 PUSHBUTTON "Analisar Agora...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DesfragmentaÃ§Ã£o", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opÃ§Ã£o irÃ¡ desfragmentar os arquivos no volume", -1, 40, 85, 160, 20 PUSHBUTTON "Desfragmentar Agora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opÃ§Ã£o irÃ¡ realizar o backup de arquivos no volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Fazer Backup Agora...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Verificar por erros...", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Esta opÃ§Ã£o vai verificar o volume por erros.", -1, 40, 25, 160, 20 PUSHBUTTON "Verificar agora...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DesfragmentaÃ§Ã£o", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Esta opÃ§Ã£o vai desfragmentar os ficheiros no volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmentar Agora...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "CÃ³pia de seguranÃ§a", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Esta opÃ§Ã£o vai criar os ficheiros do volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Executar CÃ³pia de SeguranÃ§a...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -330,12 +330,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Verificarea erorilor", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "AceastÄ opÈiune va verifica acest volum pentru eventuale erori Ã®n sistemul de fiÈiere.", -1, 40, 25, 180, 20 PUSHBUTTON "&Verificareâ¦", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "&Defragmentare", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "AceastÄ opÈiune presupune ordonarea fragmentelor de fiÈiere pentru a Ã®mbunÄtÄÈi viteza de citire.", -1, 40, 85, 180, 20 PUSHBUTTON "Defragmentareâ¦", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Copie de rezervÄ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "AceastÄ opÈiune va crea o copie de siguranÈÄ a fiÈierelor de pe aceastÄ partiÈie.", -1, 40, 150, 180, 20 PUSHBUTTON "&Creare rezervÄâ¦", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -330,12 +330,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÑÐ¾Ð²ÐµÑÐºÐ° Ð´Ð¸ÑÐºÐ°", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐ¾Ð¼Ð° Ð½Ð° Ð½Ð°Ð»Ð¸ÑÐ¸Ðµ Ð¾ÑÐ¸Ð±Ð¾Ðº.", -1, 40, 25, 160, 20 PUSHBUTTON "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ &Ð¿ÑÐ¾Ð²ÐµÑÐºÑ...", 14000, 110, 45, 120, 15, WS_TABSTOP GROUPBOX "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ Ð´Ð¸ÑÐºÐ°", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÐ°Ð½ÑÑÐ¸ÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼ ÑÐ¾Ð¼Ðµ.", -1, 40, 85, 160, 20 PUSHBUTTON "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð´&ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ñ...", 14001, 110, 105, 120, 15, WS_TABSTOP GROUPBOX "ÐÑÑÐ¸Ð²Ð°ÑÐ¸Ñ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ÐÑÑÐ¸Ð²Ð°ÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÐ°Ð½ÑÑÐ¸ÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼ ÑÐ¾Ð¼Ðµ.", -1, 40, 150, 160, 20 PUSHBUTTON "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ &Ð°ÑÑÐ¸Ð²Ð°ÑÐ¸Ñ...", 14002, 110, 170, 120, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kontrola chÃ½b", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "UmoÅ¾Åuje nÃ¡jsÅ¥ chyby na zvÃ¤zku.", -1, 40, 25, 160, 20 PUSHBUTTON "&SkontrolovaÅ¥...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "DefragmentÃ¡cia", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Defragmentuje sÃºbory na zvÃ¤zku.", -1, 40, 85, 160, 20 PUSHBUTTON "&DefragmentovaÅ¥...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "ZÃ¡lohovanie", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "ZÃ¡lohuje sÃºbory na zvÃ¤zku.", -1, 40, 150, 160, 20 PUSHBUTTON "&ZÃ¡lohovaÅ¥...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -332,12 +332,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Bagim-kontroll", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ky opsion do tÃ« kontrollojÃ« volumin pÃ«r\ngabime.", -1, 40, 25, 160, 20 PUSHBUTTON "Kontrollo tani...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentacion", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ky opsion do tÃ« defragmentojÃ« dokumentat nga vÃ«llimi", -1, 40, 85, 160, 20 PUSHBUTTON "Defragmento Tani...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Rezervat", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ky opsion do tÃ« ruaj/rezervoj dokumentat nga vÃ«llimi.", -1, 40, 150, 160, 20 PUSHBUTTON "Rezerv Tani...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Hata denetimi", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Bu seÃ§enek sÃ¼rÃ¼cÃ¼deki hatalarÄ± denetler.", -1, 40, 25, 160, 20 PUSHBUTTON "Åimdi &Denetle...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Disk BirleÅtirme", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Bu seÃ§enek sÃ¼rÃ¼cÃ¼deki dosyalarÄ± birleÅtirir.", -1, 40, 85, 160, 20 PUSHBUTTON "Åimdi &BirleÅtir...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Yedekleme", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Bu seÃ§enek sÃ¼rÃ¼cÃ¼deki dosyalarÄ± yedekler.", -1, 40, 150, 160, 20 PUSHBUTTON "Åi&mdi Yedekle...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -328,12 +328,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÐµÑÐµÐ²ÑÑÐºÐ° Ð´Ð¸ÑÐºÑ", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "ÐÐµÑÐµÐ²ÑÑÐºÐ° ÑÐ¾Ð¼Ñ Ð½Ð° Ð½Ð°ÑÐ²Ð½ÑÑÑÑ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº.", -1, 40, 25, 160, 20 PUSHBUTTON "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð¿ÐµÑÐµÐ²ÑÑÐºÑ...", 14000, 125, 45, 100, 15, WS_TABSTOP GROUPBOX "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ Ð´Ð¸ÑÐºÑ", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "ÐÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ ÑÐ°Ð¹Ð»ÑÐ² Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐ¾Ð¼Ñ", -1, 40, 85, 160, 20 PUSHBUTTON "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð´ÐµÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°ÑÑÑ...", 14001, 125, 105, 100, 15, WS_TABSTOP GROUPBOX "ÐÑÑÑÐ²Ð°ÑÑÑ", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ð ÐµÐ·ÐµÑÐ²Ð½Ðµ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»ÑÐ² Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐ¾Ð¼Ñ.", -1, 40, 150, 160, 20 PUSHBUTTON "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð°ÑÑÑÐ²Ð°ÑÑÑ...", 14002, 125, 170, 100, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -337,12 +337,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP 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] Thu Mar 19 13:48:10 2015 @@ -336,12 +336,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "Backup", -1, 5, 130, 230, 60 + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP END Added: trunk/reactos/dll/win32/shell32/res/icons/165.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/165.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/166.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/166.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/shell32/res/icons/167.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/167.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Mar 19 13:48:10 2015 @@ -372,7 +372,10 @@ #define IDI_SHELL_FONT_FILE2 157 #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 -/* TODO: 165.ico, 166.ico, 167.ico, 168.ico, 169.ico, 170.ico, 171.ico */ +#define IDI_SHELL_TOOLS_BACKUP 165 +#define IDI_SHELL_TOOLS_CHKDSK 166 +#define IDI_SHELL_TOOLS_DEFRAG 167 +/* TODO: 168.ico, 169.ico, 170.ico, 171.ico */ #define IDI_SHELL_NETWORK_FOLDER 172 #define IDI_SHELL_FAVORITES2 173 /* TODO: 174.ico, 175.ico, 176.ico, 177.ico, 178.ico, 179.ico, 180.ico, 181.ico */

1 0

[akhaldi] 66809: [CLT2015] Do not register ntobjshex.dll.
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 13:20:10 2015 New Revision: 66809 URL: http://svn.reactos.org/svn/reactos?rev=66809&view=rev Log: [CLT2015] Do not register ntobjshex.dll. Modified: branches/ReactOS-0.3.17-CLT2015/reactos/media/inf/syssetup.inf Modified: branches/ReactOS-0.3.17-CLT2015/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/media/inf/syssetup.inf [iso-8859-1] Thu Mar 19 13:20:10 2015 @@ -76,7 +76,7 @@ 11,,msxml6.dll,1 11,,netcfgx.dll,1 11,,netshell.dll,1 -11,,ntobjshex.dll,1 +;11,,ntobjshex.dll,1 11,,objsel.dll,1 11,,ole32.dll,1 11,,oleacc.dll,1

1 0

[akhaldi] 66808: [CRYPTNET] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 13:19:05 2015 New Revision: 66808 URL: http://svn.reactos.org/svn/reactos?rev=66808&view=rev Log: [CRYPTNET] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Thu Mar 19 13:19:05 2015 @@ -1186,10 +1186,27 @@ typedef BOOL (WINAPI *AddContextToStore)(HCERTSTORE hCertStore, const void *pContext, DWORD dwAddDisposition, const void **ppStoreContext); +static BOOL decode_base64_blob( const CRYPT_DATA_BLOB *in, CRYPT_DATA_BLOB *out ) +{ + BOOL ret; + DWORD len = in->cbData; + + while (len && !in->pbData[len - 1]) len--; + if (!CryptStringToBinaryA( (char *)in->pbData, len, CRYPT_STRING_BASE64_ANY, + NULL, &out->cbData, NULL, NULL )) return FALSE; + + if (!(out->pbData = CryptMemAlloc( out->cbData ))) return FALSE; + ret = CryptStringToBinaryA( (char *)in->pbData, len, CRYPT_STRING_BASE64_ANY, + out->pbData, &out->cbData, NULL, NULL ); + if (!ret) CryptMemFree( out->pbData ); + return ret; +} + static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, DWORD dwExpectedContentTypeFlags, AddContextToStore addFunc, void **ppvContext) { BOOL ret = TRUE; + CRYPT_DATA_BLOB blob; if (!pObject->cBlob) { @@ -1199,9 +1216,20 @@ } else if (pObject->cBlob == 1) { - if (!CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], - dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, - NULL, NULL, NULL, NULL, (const void **)ppvContext)) + if (decode_base64_blob(&pObject->rgBlob[0], &blob)) + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, + NULL, NULL, NULL, NULL, NULL, (const void **)ppvContext); + CryptMemFree(blob.pbData); + } + else + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &pObject->rgBlob[0], + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, 0, + NULL, NULL, NULL, NULL, NULL, (const void **)ppvContext); + } + if (!ret) { SetLastError(CRYPT_E_NO_MATCH); ret = FALSE; @@ -1219,10 +1247,21 @@ for (i = 0; i < pObject->cBlob; i++) { - if (CryptQueryObject(CERT_QUERY_OBJECT_BLOB, - &pObject->rgBlob[i], dwExpectedContentTypeFlags, - CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, - NULL, &context)) + if (decode_base64_blob(&pObject->rgBlob[i], &blob)) + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + dwExpectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_BINARY, + 0, NULL, NULL, NULL, NULL, NULL, &context); + CryptMemFree(blob.pbData); + } + else + { + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, + &pObject->rgBlob[i], dwExpectedContentTypeFlags, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, + NULL, &context); + } + if (ret) { if (!addFunc(store, context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; 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] Thu Mar 19 13:19:05 2015 @@ -68,7 +68,7 @@ reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.7.27 reactos/dll/win32/cryptdll # Synced to Wine-1.7.27 -reactos/dll/win32/cryptnet # Synced to Wine-1.7.27 +reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptui # Synced to Wine-1.7.27 reactos/dll/win32/dbghelp # Synced to Wine-1.7.27 reactos/dll/win32/dciman32 # Synced to Wine-1.7.27

1 0

[akhaldi] 66807: [IEFRAME] Simplify loading inetcpl when clicking on Properties.
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 13:15:49 2015 New Revision: 66807 URL: http://svn.reactos.org/svn/reactos?rev=66807&view=rev Log: [IEFRAME] Simplify loading inetcpl when clicking on Properties. Modified: trunk/reactos/dll/win32/ieframe/iexplore.c Modified: trunk/reactos/dll/win32/ieframe/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore… ============================================================================== --- trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Thu Mar 19 13:15:49 2015 @@ -385,7 +385,7 @@ #ifdef __REACTOS__ static void ie_dialog_properties(HWND hwnd) { - ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), TEXT("shell32.dll, Control_RunDLL inetcpl.cpl"), NULL, SW_SHOWNORMAL); + ShellExecuteW(hwnd, NULL, L"inetcpl.cpl", NULL, NULL, 0); } #endif

1 0

[akhaldi] 66806: [CRYPT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 12:37:21 2015 New Revision: 66806 URL: http://svn.reactos.org/svn/reactos?rev=66806&view=rev Log: [CRYPT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/crypt32/base64.c trunk/rostests/winetests/crypt32/ctl.c trunk/rostests/winetests/crypt32/encode.c trunk/rostests/winetests/crypt32/msg.c Modified: trunk/rostests/winetests/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/base64.… ============================================================================== --- trunk/rostests/winetests/crypt32/base64.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/base64.c [iso-8859-1] Thu Mar 19 12:37:21 2015 @@ -57,7 +57,7 @@ static const BYTE toEncode1[] = { 0 }; static const BYTE toEncode2[] = { 1,2 }; -static const BYTE toEncode3[] = { 1,2,3 }; +/* static const BYTE toEncode3[] = { 1,2,3 }; */ static const BYTE toEncode4[] = "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890" "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890" Modified: trunk/rostests/winetests/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/ctl.c?r… ============================================================================== --- trunk/rostests/winetests/crypt32/ctl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/ctl.c [iso-8859-1] Thu Mar 19 12:37:21 2015 @@ -390,20 +390,8 @@ signedCTLWithCTLInnerContentAndBadSig, sizeof(signedCTLWithCTLInnerContentAndBadSig), CERT_STORE_ADD_NEW, NULL); - if (ret) - { - /* win9x */ - ok(GetLastError() == CRYPT_E_NOT_FOUND || - GetLastError() == OSS_DATA_ERROR /* some win98 */, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); - } - else - { - ok(!ret && (GetLastError() == CRYPT_E_EXISTS || - GetLastError() == OSS_DATA_ERROR), - "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, - GetLastError()); - } + ok(!ret && (GetLastError() == CRYPT_E_EXISTS || GetLastError() == OSS_DATA_ERROR), + "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, GetLastError()); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, Modified: trunk/rostests/winetests/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.… ============================================================================== --- trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] Thu Mar 19 12:37:21 2015 @@ -3732,7 +3732,7 @@ case CERT_ALT_NAME_IP_ADDRESS: ok(U(*got).IPAddress.cbData == U(*expected).IPAddress.cbData, "Unexpected IP address length %d\n", U(*got).IPAddress.cbData); - ok(!memcmp(U(*got).IPAddress.pbData, U(*got).IPAddress.pbData, + ok(!memcmp(U(*got).IPAddress.pbData, U(*expected).IPAddress.pbData, U(*got).IPAddress.cbData), "Unexpected value\n"); break; } @@ -5762,7 +5762,6 @@ info.SubjectAlgorithm.Parameters.cbData = 0; info.ThisUpdate.dwLowDateTime = info.ThisUpdate.dwHighDateTime = 0; info.NextUpdate.dwLowDateTime = info.NextUpdate.dwHighDateTime = 0; - info.SubjectAlgorithm.pszObjId = oid2; info.SubjectAlgorithm.pszObjId = NULL; value1.cbData = sizeof(emptySequence); value1.pbData = (LPBYTE)emptySequence; Modified: trunk/rostests/winetests/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/msg.c?r… ============================================================================== --- trunk/rostests/winetests/crypt32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/msg.c [iso-8859-1] Thu Mar 19 12:37:21 2015 @@ -2666,12 +2666,12 @@ ok(got->Issuer.cbData == expected->Issuer.cbData, "Expected issuer size %d, got %d\n", expected->Issuer.cbData, got->Issuer.cbData); - ok(!memcmp(got->Issuer.pbData, got->Issuer.pbData, got->Issuer.cbData), + ok(!memcmp(got->Issuer.pbData, expected->Issuer.pbData, got->Issuer.cbData), "Unexpected issuer\n"); ok(got->SerialNumber.cbData == expected->SerialNumber.cbData, "Expected serial number size %d, got %d\n", expected->SerialNumber.cbData, got->SerialNumber.cbData); - ok(!memcmp(got->SerialNumber.pbData, got->SerialNumber.pbData, + ok(!memcmp(got->SerialNumber.pbData, expected->SerialNumber.pbData, got->SerialNumber.cbData), "Unexpected serial number\n"); /* FIXME: check more things */ }

1 0

[akhaldi] 66805: [CRYPT32] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 12:37:00 2015 New Revision: 66805 URL: http://svn.reactos.org/svn/reactos?rev=66805&view=rev Log: [CRYPT32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Thu Mar 19 12:37:00 2015 @@ -975,7 +975,7 @@ { CRYPT_KEY_PROV_INFO copy; WCHAR containerW[MAX_PATH]; - BOOL matches = FALSE; + BOOL matches; MultiByteToWideChar(CP_ACP, 0, container, -1, containerW, sizeof(containerW) / sizeof(containerW[0])); @@ -1133,7 +1133,7 @@ BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, DWORD dwFlags, void *pvReserved) { - BOOL matches = FALSE; + BOOL matches; TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); @@ -2878,7 +2878,7 @@ static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit) { - BOOL set = FALSE; + BOOL set; DWORD indexIndex = bit / BITS_PER_DWORD; assert(field->cIndexes); @@ -3090,7 +3090,6 @@ CryptMemFree(szProvider); } } - size = sizeof(info.dwKeySpec); /* in case no CRYPT_KEY_PROV_INFO given, * we always use AT_SIGNATURE key spec */ Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Thu Mar 19 12:37:00 2015 @@ -482,6 +482,7 @@ "/usr/share/ca-certificates/ca-bundle.crt", "/usr/local/share/certs/", "/etc/sfw/openssl/certs", + "/etc/security/cacerts", /* Android */ }; static const BYTE authenticode[] = { 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] Thu Mar 19 12:37:00 2015 @@ -65,7 +65,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 reactos/dll/win32/compstui # Synced to Wine-1.7.27 reactos/dll/win32/credui # Synced to Wine-1.7.27 -reactos/dll/win32/crypt32 # Synced to Wine-1.7.27 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.7.27 reactos/dll/win32/cryptdll # Synced to Wine-1.7.27 reactos/dll/win32/cryptnet # Synced to Wine-1.7.27

1 0

[akhaldi] 66804: [COMDLG32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 12:24:17 2015 New Revision: 66804 URL: http://svn.reactos.org/svn/reactos?rev=66804&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/comdlg32/itemdlg.c trunk/rostests/winetests/comdlg32/printdlg.c Modified: trunk/rostests/winetests/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/itemdl… ============================================================================== --- trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] Thu Mar 19 12:24:17 2015 @@ -679,7 +679,7 @@ ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); ok(hr == S_OK, "got 0x%08x.\n", hr); - /* I hope noone relies on this one */ + /* I hope no one relies on this one */ todo_wine ok(filetype == 0, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… ============================================================================== --- trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/printdlg.c [iso-8859-1] Thu Mar 19 12:24:17 2015 @@ -531,6 +531,7 @@ if (!winetest_interactive) { skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); + HeapFree(GetProcessHeap(), 0, pDlg); return; }

1 0

[akhaldi] 66803: [COMDLG32] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 12:24:05 2015 New Revision: 66803 URL: http://svn.reactos.org/svn/reactos?rev=66803&view=rev Log: [COMDLG32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Thu Mar 19 12:24:05 2015 @@ -1556,41 +1556,37 @@ /* 2. (All platforms) If initdir is not null, then use it */ if (!handledPath && fodInfos->initdir && *fodInfos->initdir) { - /* Work out the proper path as supplied one might be relative */ - /* (Here because supplying '.' as dir browses to My Computer) */ - if (!handledPath) { - WCHAR tmpBuf[MAX_PATH]; - WCHAR tmpBuf2[MAX_PATH]; - WCHAR *nameBit; - DWORD result; - - lstrcpyW(tmpBuf, fodInfos->initdir); - if( PathFileExistsW(tmpBuf) ) { - /* initdir does not have to be a directory. If a file is - * specified, the dir part is taken */ - if( PathIsDirectoryW(tmpBuf)) { - if (tmpBuf[lstrlenW(tmpBuf)-1] != '\\') { - lstrcatW(tmpBuf, szwSlash); - } - lstrcatW(tmpBuf, szwStar); - } - result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); - if (result) { - *nameBit = 0x00; - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1)*sizeof(WCHAR)); - lstrcpyW(fodInfos->initdir, tmpBuf2); - handledPath = TRUE; - TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); - } - } - else if (fodInfos->initdir) - { - MemFree(fodInfos->initdir); - fodInfos->initdir = NULL; - TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); - } - } + /* Work out the proper path as supplied one might be relative */ + /* (Here because supplying '.' as dir browses to My Computer) */ + WCHAR tmpBuf[MAX_PATH]; + WCHAR tmpBuf2[MAX_PATH]; + WCHAR *nameBit; + DWORD result; + + lstrcpyW(tmpBuf, fodInfos->initdir); + if (PathFileExistsW(tmpBuf)) { + /* initdir does not have to be a directory. If a file is + * specified, the dir part is taken */ + if (PathIsDirectoryW(tmpBuf)) { + PathAddBackslashW(tmpBuf); + lstrcatW(tmpBuf, szwStar); + } + result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); + if (result) { + *nameBit = 0x00; + MemFree(fodInfos->initdir); + fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1) * sizeof(WCHAR)); + lstrcpyW(fodInfos->initdir, tmpBuf2); + handledPath = TRUE; + TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); + } + } + else if (fodInfos->initdir) + { + MemFree(fodInfos->initdir); + fodInfos->initdir = NULL; + TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); + } } if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir)) @@ -3240,7 +3236,6 @@ int iIndentation; TEXTMETRICW tm; LPSFOLDER tmpFolder; - LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT icon_width, icon_height; @@ -3263,16 +3258,8 @@ shgfi_flags |= SHGFI_SMALLICON; } - if(pDIStruct->itemID == liInfos->uSelectedItem) - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } - else - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } + ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, + 0, &sfi, sizeof (sfi), shgfi_flags ); /* Is this item selected ? */ if(pDIStruct->itemState & ODS_SELECTED) @@ -3290,16 +3277,10 @@ /* Do not indent item if drawing in the edit of the combo */ if(pDIStruct->itemState & ODS_COMBOBOXEDIT) - { iIndentation = 0; - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - - } else - { iIndentation = tmpFolder->m_iIndent; - } + /* Draw text and icon */ /* Initialise the icon display area */ Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] Thu Mar 19 12:24:05 2015 @@ -919,7 +919,7 @@ return S_OK; /* Check if there is a mask to apply if not */ - if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) + if(!fodInfos->ShellInfos.lpstrCurrentFilter || !fodInfos->ShellInfos.lpstrCurrentFilter[0]) return S_OK; if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str))) Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Thu Mar 19 12:24:05 2015 @@ -816,8 +816,7 @@ Names = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(char)*NamesSize); Words = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WORD)); - NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, - fwCapability_Names, Names, dm); + DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Words, (LPSTR)Words, dm); @@ -927,8 +926,7 @@ Names = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WCHAR)*NamesSize); Words = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WORD)); - NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, - fwCapability_Names, Names, dm); + DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Words, Words, dm); @@ -1776,10 +1774,12 @@ case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextA(hDlg, cmb2, (char *)lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -1932,10 +1932,12 @@ case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextW(hDlg, cmb2, lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -3791,16 +3793,16 @@ { if(data->unicode) res = FindResourceW(data->u.dlgw->hInstance, - data->u.dlgw->lpPageSetupTemplateName, MAKEINTRESOURCEW(RT_DIALOG)); + data->u.dlgw->lpPageSetupTemplateName, (LPWSTR)RT_DIALOG); else res = FindResourceA(data->u.dlga->hInstance, - data->u.dlga->lpPageSetupTemplateName, MAKEINTRESOURCEA(RT_DIALOG)); + data->u.dlga->lpPageSetupTemplateName, (LPSTR)RT_DIALOG); tmpl_handle = LoadResource(data->u.dlgw->hInstance, res); } else { res = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(PAGESETUPDLGORD), - MAKEINTRESOURCEW(RT_DIALOG)); + (LPWSTR)RT_DIALOG); tmpl_handle = LoadResource(COMDLG32_hInstance, res); } return LockResource(tmpl_handle); 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] Thu Mar 19 12:24:05 2015 @@ -62,7 +62,7 @@ reactos/dll/win32/clusapi # Synced to Wine-1.7.27 reactos/dll/win32/comcat # Synced to Wine-1.7.27 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/comdlg32 # Synced to Wine-1.7.27 +reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 reactos/dll/win32/compstui # Synced to Wine-1.7.27 reactos/dll/win32/credui # Synced to Wine-1.7.27 reactos/dll/win32/crypt32 # Synced to Wine-1.7.27

1 0

[akhaldi] 66802: * Addendum to r66800.
by akhaldi＠svn.reactos.org 19 Mar '15

19 Mar '15

Author: akhaldi Date: Thu Mar 19 12:08:58 2015 New Revision: 66802 URL: http://svn.reactos.org/svn/reactos?rev=66802&view=rev Log: * Addendum to r66800. Added: trunk/reactos/dll/win32/comctl32/icon.c (with props) trunk/reactos/dll/win32/comctl32/theme_scrollbar.c (with props) Added: trunk/reactos/dll/win32/comctl32/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/icon.c?… ============================================================================== --- trunk/reactos/dll/win32/comctl32/icon.c (added) +++ trunk/reactos/dll/win32/comctl32/icon.c [iso-8859-1] Thu Mar 19 12:08:58 2015 @@ -0,0 +1,59 @@ +/* + * Comctl32 Icon functions + * + * Copyright 2014 Michael MÃ¼ller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "comctl32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commctrl); + +HRESULT WINAPI +LoadIconMetric (HINSTANCE hinst, PCWSTR name, INT size, HICON *icon) +{ + INT width, height; + + TRACE("(%p %s %d %p)\n", hinst, debugstr_w(name), size, icon); + + if (!icon) + return E_INVALIDARG; + + /* windows sets it to zero in a case of failure */ + *icon = NULL; + + if (!name) + return E_INVALIDARG; + + if (size == LIM_SMALL) + { + width = GetSystemMetrics( SM_CXSMICON ); + height = GetSystemMetrics( SM_CYSMICON ); + } + else if (size == LIM_LARGE) + { + width = GetSystemMetrics( SM_CXICON ); + height = GetSystemMetrics( SM_CYICON ); + } + else + return E_INVALIDARG; + + *icon = LoadImageW( hinst, name, IMAGE_ICON, width, height, LR_SHARED ); + if (*icon) + return S_OK; + + return HRESULT_FROM_WIN32(GetLastError()); +} Propchange: trunk/reactos/dll/win32/comctl32/icon.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/comctl32/theme_scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_s… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_scrollbar.c (added) +++ trunk/reactos/dll/win32/comctl32/theme_scrollbar.c [iso-8859-1] Thu Mar 19 12:08:58 2015 @@ -0,0 +1,33 @@ +/* + * Theming - Scrollbar control + * + * Copyright (c) 2015 Mark Harmstone + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "comctl32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); + +LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); + + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); +} Propchange: trunk/reactos/dll/win32/comctl32/theme_scrollbar.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs