Index: src/ch/ch.rc =================================================================== diff -u -r045540c818c374806d09742ef3d7a984d8d757d3 -r703c2c3cbecb069b164b38bd34ed708ae15225c6 --- src/ch/ch.rc (.../ch.rc) (revision 045540c818c374806d09742ef3d7a984d8d757d3) +++ src/ch/ch.rc (.../ch.rc) (revision 703c2c3cbecb069b164b38bd34ed708ae15225c6) @@ -31,21 +31,21 @@ // IDD_MSGBOX_DIALOG DIALOGEX 0, 0, 177, 70 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_THICKFRAME CAPTION "Copy Handler" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - PUSHBUTTON "Btn2",IDC_SECOND_BUTTON,63,49,50,14 - PUSHBUTTON "Btn3",IDC_THIRD_BUTTON,119,49,50,14 - ICON "",IDC_IMAGE_STATIC,13,13,21,20,SS_REALSIZEIMAGE + PUSHBUTTON "",IDC_SECOND_BUTTON,63,49,50,14 + PUSHBUTTON "",IDC_THIRD_BUTTON,119,49,50,14 + ICON "",IDC_IMAGE_STATIC,13,13,20,20,SS_REALSIZEIMAGE CONTROL "Do not show this again",IDC_BASIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,163,10 - PUSHBUTTON "Btn1",IDC_FIRST_BUTTON,7,49,50,14 - CONTROL "",IDC_MSG_RICHEDIT,"RichEdit20W",WS_DISABLED | WS_TABSTOP | 0x804,43,13,127,20 - CONTROL "",IDC_MEASURE_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP | 0x8c4,7,7,11,7 + PUSHBUTTON "",IDC_FIRST_BUTTON,7,49,50,14 + CONTROL "",IDC_MSG_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_TABSTOP,43,13,127,20 + CONTROL "",IDC_MEASURE_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,7,7,11,7 END IDD_BUFFERSIZE_DIALOG DIALOGEX 0, 0, 345, 135 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Buffer size settings" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -62,7 +62,7 @@ EDITTEXT IDC_BUFFERCOUNT_EDIT,206,82,122,14,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_BUFFERCOUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,327,82,11,14 CONTROL "Use only default buffer",IDC_ONLYDEFAULT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,331,10,0,HIDC_ONLYDEFAULT_CHECK - DEFPUSHBUTTON "&OK",IDOK,176,114,50,14,0,0,0x80890001 + DEFPUSHBUTTON "&OK",IDOK,176,114,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,229,114,50,14,0,0,HIDCANCEL PUSHBUTTON "&Help",IDC_HELP_BUTTON,288,114,50,14,0,0,HIDC_HELP_BUTTON LTEXT "Default",IDC_001_STATIC,35,7,127,8 @@ -79,15 +79,15 @@ END IDD_FEEDBACK_FILE_ERROR_DIALOG DIALOGEX 0, 0, 283, 112 -STYLE DS_SYSMODAL | DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SYSMODAL | DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File Error" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN PUSHBUTTON "&Retry",IDC_RETRY_BUTTON,7,79,64,14,0,0,HIDC_RETRY_BUTTON PUSHBUTTON "&Skip",IDC_SKIP_BUTTON,74,79,64,14,0,0,HIDC_SKIP_BUTTON DEFPUSHBUTTON "&Pause",IDC_PAUSE_BUTTON,141,79,64,14,0,0,HIDC_PAUSE_BUTTON PUSHBUTTON "&Cancel",IDCANCEL,212,79,64,14,0,0,HIDCANCEL - ICON IDI_ERR_ICON,IDC_001_STATIC,15,15,21,20,SS_REALSIZEIMAGE + ICON IDI_ERR_ICON,IDC_001_STATIC,15,15,20,20,SS_REALSIZEIMAGE CONTROL "&Apply to all items",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,269,10 LTEXT "Encountered an error while processing file.",IDC_DESC_STATIC,43,7,223,23 LTEXT "File: c:\\test.avi\nReason: No permission to perform the operation requested.",IDC_INFO_STATIC,51,28,225,42 @@ -103,15 +103,15 @@ END IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 397, 214 -STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Options" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,173,193,50,14,0,0,HIDCANCEL + DEFPUSHBUTTON "&OK",IDOK,173,193,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,227,193,50,14,0,0,HIDCANCEL LISTBOX IDC_PROPERTIES_LIST,7,7,383,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST PUSHBUTTON "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,HIDC_APPLY_BUTTON - PUSHBUTTON "&Help",IDHELP,340,193,50,14,0,0,HIDCANCEL + PUSHBUTTON "&Help",IDHELP,340,193,50,14,0,0,HIDHELP END IDD_STATUS_DIALOG DIALOGEX 0, 0, 491, 302 @@ -186,7 +186,7 @@ END IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 255, 147 -STYLE DS_SYSMODAL | DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SYSMODAL | DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Not enough free space" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -196,15 +196,15 @@ LISTBOX IDC_FILES_LIST,42,35,206,44,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,HIDC_FILES_LIST LTEXT "",IDC_REQUIRED_STATIC,109,85,139,8,0,0,HIDC_REQUIRED_STATIC LTEXT "",IDC_AVAILABLE_STATIC,109,97,139,8,0,0,HIDC_AVAILABLE_STATIC - ICON IDI_WARNING_ICON,IDC_001_STATIC,9,11,21,20,SS_REALSIZEIMAGE + ICON IDI_WARNING_ICON,IDC_001_STATIC,9,11,20,20,SS_REALSIZEIMAGE LTEXT "Required space:",IDC_003_STATIC,41,85,59,8 LTEXT "Space available:",IDC_004_STATIC,41,97,59,8 LTEXT "",IDC_HEADER_STATIC,42,7,206,24 CONTROL "&Do not ask anymore",IDC_ALL_ITEMS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,241,10 END IDD_SHUTDOWN_DIALOG DIALOGEX 0, 0, 186, 86 -STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Copy handler" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -216,7 +216,7 @@ END IDD_CUSTOM_COPY_DIALOG DIALOGEX 0, 0, 351, 318 -STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Copying/moving parameters" FONT 8, "Tahoma", 0, 0, 0x1 @@ -241,8 +241,8 @@ "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,255,329,10,0,HIDC_IGNOREFOLDERS_CHECK CONTROL "Do not copy/move contents of files - only create it (empty)",IDC_ONLYSTRUCTURE_CHECK, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,13,277,329,10,0,HIDC_ONLYSTRUCTURE_CHECK - PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,0x80950001 - PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,0x80950002 + PUSHBUTTON "&OK",IDOK,186,297,50,14,0,0,HIDOK + PUSHBUTTON "&Cancel",IDCANCEL,239,297,50,14,0,0,HIDCANCEL LTEXT "Source files/folders:",IDC_001_STATIC,7,7,337,8 LTEXT "Destination folder:",IDC_002_STATIC,7,76,337,8 LTEXT "Operation type:",IDC_003_STATIC,13,115,117,8 @@ -261,7 +261,7 @@ END IDD_FILTER_DIALOG DIALOGEX 0, 0, 291, 266 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Filtering settings" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -299,14 +299,14 @@ CONTROL "Hidden",IDC_HIDDEN_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,212,68,10,0,HIDC_HIDDEN_CHECK CONTROL "System",IDC_SYSTEM_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,117,224,68,10,0,HIDC_SYSTEM_CHECK CONTROL "Directory",IDC_DIRECTORY_CHECK,"Button",BS_AUTO3STATE | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,191,212,93,10,0,HIDC_DIRECTORY_CHECK - DEFPUSHBUTTON "&OK",IDOK,127,245,50,14,0,0,HIDCANCEL + DEFPUSHBUTTON "&OK",IDOK,127,245,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,179,245,50,14,0,0,HIDCANCEL CONTROL "",IDC_001_STATIC,"Static",SS_ETCHEDHORZ,7,238,276,1 PUSHBUTTON "&Help",IDC_HELP_BUTTON,234,245,50,14,0,0,HIDC_HELP_BUTTON END IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 325, 206 -STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME CAPTION "Shortcuts editing" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -317,7 +317,7 @@ PUSHBUTTON "&Add",IDC_ADD_BUTTON,17,160,50,14,0,0,HIDC_ADD_BUTTON PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,69,160,50,14,0,0,HIDC_CHANGE_BUTTON PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,121,160,50,14,0,0,HIDC_DELETE_BUTTON - DEFPUSHBUTTON "&OK",IDOK,156,185,50,14,0,0,HIDCANCEL + DEFPUSHBUTTON "&OK",IDOK,156,185,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,211,185,50,14,0,0,HIDCANCEL LTEXT "Shortcuts:",IDC_001_STATIC,7,7,311,8 LTEXT "Name:",IDC_002_STATIC,18,126,53,8 @@ -329,7 +329,7 @@ END IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 325, 190 -STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_CENTER | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME CAPTION "Recent paths" FONT 8, "Tahoma", 0, 0, 0x1 BEGIN @@ -339,20 +339,20 @@ PUSHBUTTON "&Add",IDC_ADD_BUTTON,20,141,50,14,0,0,HIDC_ADD_BUTTON PUSHBUTTON "&Update",IDC_CHANGE_BUTTON,72,141,50,14,0,0,HIDC_CHANGE_BUTTON PUSHBUTTON "&Delete",IDC_DELETE_BUTTON,124,141,50,14,0,0,HIDC_DELETE_BUTTON - DEFPUSHBUTTON "&OK",IDOK,156,169,50,14,0,0,HIDCANCEL + DEFPUSHBUTTON "&OK",IDOK,156,169,50,14,0,0,HIDOK PUSHBUTTON "&Cancel",IDCANCEL,211,169,50,14,0,0,HIDCANCEL LTEXT "Recently used paths:",IDC_001_STATIC,7,7,311,8 GROUPBOX "Path",IDC_002_STATIC,7,110,311,51 PUSHBUTTON "&Help",IDC_HELP_BUTTON,268,169,50,14,0,0,HIDC_HELP_BUTTON END IDD_ABOUTBOX DIALOGEX 0, 0, 369, 164 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About ..." FONT 8, "Tahoma", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,306,143,56,14,WS_GROUP,0,HIDCANCEL - ICON IDR_MAINFRAME,IDC_STATIC,11,14,21,20 + DEFPUSHBUTTON "&OK",IDOK,306,143,56,14,WS_GROUP,0,HIDOK + ICON IDR_MAINFRAME,IDC_STATIC,11,14,20,20 CTEXT "",IDC_COPYRIGHT_STATIC,40,93,322,8 CONTROL "",IDC_HOMEPAGELINK_STATIC,"STATICEX",0x1,208,32,154,8 CONTROL "",IDC_CONTACT1LINK_STATIC,"STATICEX",0x1,208,59,154,8 @@ -368,7 +368,7 @@ END IDD_CRASH_DIALOG DIALOGEX 0, 0, 316, 138 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Application crashed" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -381,7 +381,7 @@ END IDD_UPDATER_DIALOG DIALOGEX 0, 0, 305, 147 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Copy Handler Update Information" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -397,7 +397,7 @@ END IDD_FEEDBACK_REPLACE_DIALOG DIALOGEX 0, 0, 319, 186 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "File already exists" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -738,7 +738,62 @@ 0 END +IDD_MSGBOX_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END +IDD_ABOUTBOX AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_BUFFERSIZE_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CRASH_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_FEEDBACK_FILE_ERROR_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_FILTER_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_RECENTEDIT_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_SHORTCUTEDIT_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_SHUTDOWN_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -748,14 +803,16 @@ BEGIN IDS_ONECOPY_STRING "Cannot run the second instance of this program" IDS_REGISTEROK_STRING "Integration with system enabled successfully." - IDS_REGISTERERR_STRING "Encountered an error while trying to enable integration with system.\nError #%errno (%errdesc)." + IDS_REGISTERERR_STRING "Failed to enable integration with system." IDS_UNREGISTEROK_STRING "Integration with system disabled successfully." - IDS_UNREGISTERERR_STRING - "Encountered an error while trying to disable integration with system.\nError #%errno (%errdesc)." + IDS_UNREGISTERERR_STRING "Failed to disable integration with system." IDS_CRASH_STRING "Copy Handler encountered an internal problem and will be closed.\n\nIf you want to help correct this problem in the future releases of program you can send the crash information to the author of this program." IDS_COMMAND_LINE_FAILED_STRING "Cannot process command line arguments passed to Copy Handler." - IDS_CHEXT_ALREADY_UNREGISTERED "Integration with system already disabled." + IDS_REGISTERED_ONLYNATIVE + "Successfully enabled 64bit integration.\nFailed to enable 32bit integration." + IDS_REGISTERED_ONLY32BIT + "Failed to enable 64bit integration.\nSuccessfully enabled 32bit integration." END STRINGTABLE @@ -821,16 +878,14 @@ STRINGTABLE BEGIN - IDS_CFGSHSHOWICONS_STRING "Show icons with shortcuts (experimental)" - IDS_CFGSHINTERCEPTDRAG_STRING - "Intercept drag&drop operations (experimental)" + IDS_CFGSHSHOWICONS_STRING "Show icons with shortcuts" + IDS_CFGSHINTERCEPTDRAG_STRING "Intercept drag&drop operations" IDS_CFGSHORTCUTS_STRING "Shortcuts" IDS_CFGRECENT_STRING "Recently used paths" IDS_CFGSHELL_STRING "Shell" IDS_CFGSCCOUNT_STRING "Defined shortcuts' count" IDS_CFGRPCOUNT_STRING "Count of recent paths" - IDS_CFGINTERCEPTKEYACTION_STRING - "Intercept shell keyboard actions (experimental)" + IDS_CFGINTERCEPTKEYACTION_STRING "Intercept shell keyboard actions" IDS_CFGPRIORITYCLASS_STRING "Application's priority class" IDS_CFGDISABLEPRIORITYBOOST_STRING "Disable priority boosting" IDS_BOOLTEXT_STRING "No!Yes" @@ -842,21 +897,37 @@ STRINGTABLE BEGIN - IDS_CFGINTERCEPTCONTEXTMENU_STRING - "Intercept standard Windows operations (experimental/not recommended)" + IDS_CFGINTERCEPTCONTEXTMENU_STRING "Intercept standard Windows operations" IDS_CFG_CHECK_FOR_UPDATES_FREQUENCY "Check for program updates" IDS_CFG_UPDATECHANNEL "Update channel" - IDS_CFG_USE_SECURE_CONNECTION "Use secure connection when checking for updates" - IDS_CFGLOGLEVEL "Log level" - IDS_CFGLOGLEVEL_VALUES "Debug!Info!Warning!Error" - IDS_UPDATE_FREQUENCIES "Never!Every startup!Daily!Weekly!Once every 2 weeks!Monthly!Quarterly" - IDS_SECURE_CONNECTION_TYPES "No!Yes!Auto" - IDS_BUFFER_QUEUE_DEPTH "Buffer queue depth" + IDS_CFGLOGLEVEL_VALUES "Trace!Debug!Info!Warning!Error!Fatal" + IDS_UPDATE_FREQUENCIES "Never!Every startup!Daily!Weekly!Once every 2 weeks!Monthly!Quarterly" + IDS_BUFFER_QUEUE_DEPTH "Buffer queue depth" IDS_FASTMOVEBEFOREBLOCK_STRING "Use fast move before blocking" + IDS_CFG_USE_SECURE_CONNECTION + "Use secure connection when checking for updates" + IDS_SECURE_CONNECTION_TYPES "No!Yes!Auto" + IDS_USECUSTOMNAMING "Use custom naming" + IDS_CUSTOMNAME_FIRST "Name format for first copy (use %name, %ext)" + IDS_CUSTOMNAME_SUBSEQUENT + "Name format for the subsequent copies (use %name, %ext, %count)" + IDS_CFGLOGLEVEL_APP "Log level - application" + IDS_CFGLOGLEVEL_ENGINEDEFAULT "Log level - engine" + IDS_CFGLOGLEVEL_SERIALIZER "Log level - data serializer" END STRINGTABLE BEGIN + IDS_CFGLOGLEVEL_TASK "Log level - task" + IDS_CFGLOGLEVEL_SUBTASK_SCANDIR "Log level - subtask - scan directory" + IDS_CFGLOGLEVEL_SUBTASK_COPYMOVE "Log level - subtask - copy/move" + IDS_CFGLOGLEVEL_SUBTASK_FASTMOVE "Log level - subtask - fast move" + IDS_CFGLOGLEVEL_SUBTASK_DELETE "Log level - subtask - delete" + IDS_CFGLOGLEVEL_FILESYSTEM "Log level - filesystem" +END + +STRINGTABLE +BEGIN IDS_MINIVIEWAUTOHIDE_STRING "Hide when empty" IDS_PROCESSINGTHREAD_STRING "Copying/moving thread" IDS_AUTOCOPYREST_STRING "Auto ""copy-rest"" of files" @@ -973,8 +1044,8 @@ STRINGTABLE BEGIN - IDS_FIRSTCOPY_STRING "Copy of %name" - IDS_NEXTCOPY_STRING "Copy (%count) of %name" + IDS_FIRSTCOPY_STRING "%name - copy%ext" + IDS_NEXTCOPY_STRING "%name - copy (%count)%ext" IDS_NOTFOUND_STRING "File not found (doesn't exist)" IDS_BYTE_STRING "B" IDS_KBYTE_STRING "kB" @@ -1006,6 +1077,7 @@ IDS_UPDATER_ALREADYNEWESTVERSION "You already have the newest version" IDS_UPDATER_NEWVERSIONEXISTS "There are updates available" IDS_UPDATER_RELEASENOTES "Release notes:" + IDS_FINALIZE_CH_ERROR "Failed to finalize Copy Handler. Some information about tasks being processed might be lost. Error: %reason." END STRINGTABLE @@ -1123,8 +1195,8 @@ IDS_PLUGSFOLDER_STRING "Folder with plugins" IDS_PLUGSFOLDERCHOOSE_STRING "!Choose folder with plugins" IDS_CFGLOGFILE_STRING "Debugging" - IDS_CFGENABLELOGGING_STRING "Enable logging" IDS_CFGMAXLIMIT_STRING "Maximum size of the log file" + IDS_CFGROTATEDCOUNT_STRING "Maximum count of rotated log files to keep" IDS_CFGHELPDIR_STRING "Directory with help files" IDS_CFGHELPDIRCHOOSE_STRING "!Choose folder with program's help files" IDS_LANGUAGESFOLDER_STRING "Directory with language files"