Index: src/ch/ch.rc =================================================================== diff -u -r1c585b955eb548cbedc7d36f1ea5af484206e7eb -rf8b6de9c28b2957db0b4e71efa11df8632e41261 --- src/ch/ch.rc (.../ch.rc) (revision 1c585b955eb548cbedc7d36f1ea5af484206e7eb) +++ src/ch/ch.rc (.../ch.rc) (revision f8b6de9c28b2957db0b4e71efa11df8632e41261) @@ -412,8 +412,8 @@ EDITTEXT IDC_DST_FILESIZE_EDIT,96,147,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER EDITTEXT IDC_DST_MODIFIEDDATE_EDIT,96,159,251,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER LTEXT "File you are trying to copy already exists. What do you want to do?",IDC_INFO_STATIC,7,7,350,15 - ICON "",IDC_SRC_ICON_STATIC,19,39,14,13 - ICON "",IDC_DST_ICON_STATIC,19,111,14,13 + ICON "",IDC_SRC_ICON_STATIC,19,39,20,20 + ICON "",IDC_DST_ICON_STATIC,19,111,20,20 GROUPBOX "Source file",IDC_SRCFILE_STATIC,7,20,350,66 GROUPBOX "Destination file",IDC_DSTFILE_STATIC,7,92,350,85 LTEXT "Name:",IDC_SRC_NAME_STATIC,49,34,45,8 @@ -425,6 +425,7 @@ LTEXT "Location:",IDC_DST_LOCATION_STATIC,49,135,45,8 LTEXT "Size:",IDC_DST_SIZE_STATIC,49,147,45,8 LTEXT "Modified:",IDC_DST_TIME_STATIC,49,159,45,8 + CONTROL "C&ustom rules...",IDC_CUSTOM_RULES_BUTTON,"MfcButton",WS_TABSTOP,7,202,81,14 END IDD_RULE_EDIT_ALREADYEXISTS_DIALOG DIALOGEX 0, 0, 291, 219 @@ -475,7 +476,7 @@ LTEXT "When all of the following conditions are met...:",IDC_HEADER_STATIC,7,7,277,8 LTEXT "...then respond with:",IDC_RESPONSE_STATIC,7,155,277,8 COMBOBOX IDC_RESPONSE_COMBO,15,168,269,133,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_FILTER_BY_SYSTEMERROR_EDIT,15,126,269,14,ES_AUTOHSCROLL + EDITTEXT IDC_FILTER_BY_SYSTEMERROR_EDIT,15,126,269,14,ES_AUTOHSCROLL | ES_NUMBER END IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG DIALOGEX 0, 0, 291, 157 @@ -740,7 +741,8 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 100, 0, 0 + 0, 100, 0, 0, + 0, 0, 0, 0 END IDD_CUSTOM_COPY_DIALOG AFX_DIALOG_LAYOUT @@ -1141,6 +1143,28 @@ 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, "\076" + IDC_CUSTOM_RULES_BUTTON, 0x37c, 369, 0 +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x535f, 0x7974, 0x656c, 0x343e, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7453, 0x6c79, 0x3e65, +0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x415f, 0x7475, 0x736f, 0x7a69, +0x3e65, 0x4146, 0x534c, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, +0x415f, 0x7475, 0x736f, 0x7a69, 0x3e65, 0x4d3c, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x4d2f, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x545f, 0x6f6f, 0x746c, 0x7069, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x7546, 0x6c6c, 0x6554, 0x7478, 0x6f54, 0x6c6f, +0x543e, 0x5552, 0x3c45, 0x4d2f, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x465f, +0x6c75, 0x546c, 0x7865, 0x5474, 0x6f6f, 0x3e6c, 0x4d3c, 0x4346, 0x7542, +0x7474, 0x6e6f, 0x435f, 0x7275, 0x6f73, 0x5472, 0x7079, 0x3e65, 0x3131, +0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x7543, 0x7372, 0x726f, +0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x5465, 0x7079, 0x3e65, 0x3c38, 0x4d2f, 0x4346, 0x7542, 0x7474, +0x6e6f, 0x495f, 0x616d, 0x6567, 0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, +0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x546e, 0x706f, 0x463e, +0x4c41, 0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, +0x6761, 0x4f65, 0x546e, 0x706f, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, +0x5f6e, 0x6d49, 0x6761, 0x4f65, 0x526e, 0x6769, 0x7468, 0x463e, 0x4c41, +0x4553, 0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, +0x4f65, 0x526e, 0x6769, 0x7468, "\076" 0 END @@ -1415,15 +1439,6 @@ IDS_DT_STRING "<>" IDS_UPDATER_NEW_VERSION_STRING "Updated version: %officialver (%numericver).\nReleased: %reldate" - IDS_FEEDBACK_RESPONSE_UNKNOWN "Unknown" - IDS_FEEDBACK_RESPONSE_OVERWRITE "Replace" - IDS_FEEDBACK_RESPONSE_RESUME "Resume" - IDS_FEEDBACK_RESPONSE_SKIP "Skip" - IDS_FEEDBACK_RESPONSE_CANCEL "Cancel" - IDS_FEEDBACK_RESPONSE_PAUSE "Pause" - IDS_FEEDBACK_RESPONSE_RETRY "Retry" - IDS_FEEDBACK_RESPONSE_IGNORE "Ignore" - IDS_FEEDBACK_RESPONSE_RENAME "Rename" END STRINGTABLE @@ -1442,10 +1457,23 @@ 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." + IDS_FEEDBACK_RESPONSE_UNKNOWN "Unknown" + IDS_FEEDBACK_RESPONSE_OVERWRITE "Replace" + IDS_FEEDBACK_RESPONSE_RESUME "Resume" + IDS_FEEDBACK_RESPONSE_SKIP "Skip" + IDS_FEEDBACK_RESPONSE_CANCEL "Cancel" END STRINGTABLE BEGIN + IDS_FEEDBACK_RESPONSE_PAUSE "Pause" + IDS_FEEDBACK_RESPONSE_RETRY "Retry" + IDS_FEEDBACK_RESPONSE_IGNORE "Ignore" + IDS_FEEDBACK_RESPONSE_RENAME "Rename" +END + +STRINGTABLE +BEGIN IDS_BSONEDISK_STRING "One disk: " IDS_BSTWODISKS_STRING "Two disks: " IDS_BSCD_STRING "CD: " @@ -1499,42 +1527,42 @@ IDS_FILTERDATE_STRING "any" IDS_HDREXCLUDEMASK_STRING "Exclude mask" IDS_HDREXCLUDEATTRIB_STRING "Attributes excluded" - IDS_HDRRESULT_STRING "Response" - IDS_HDROPERATION_STRING "Operation" - IDS_HDRSYSTEMERROR_STRING "System error" IDS_FILTERATTRIB_STRING "none" IDS_EMPTYFILTER_STRING "None of filtering options were selected" IDS_FLTALLFILTER_STRING "All files (*.*)|*.*||" IDS_IMPORTREPORT_STRING "Imported %count path(s)" - IDS_SOURCE_FILE_STRING "source" - IDS_DESTINATION_FILE_STRING "destination" END STRINGTABLE BEGIN - IDS_OPERATION_DELETEERROR "Delete" - IDS_OPERATION_SEEKERROR "Seek" - IDS_OPERATION_RESIZEERROR "Resize" - IDS_OPERATION_READERROR "Read" - IDS_OPERATION_WRITEERROR "Write" - IDS_OPERATION_FINALIZEERROR "Finalize" - IDS_OPERATION_FASTMOVEERROR "Fast move" - IDS_OPERATION_CREATEERROR "Create" - IDS_OPERATION_CHECKFORFREESPACE "Check for free space" - IDS_OPERATION_RETRIEVEFILEINFO "Retrieve file information" -END - -STRINGTABLE -BEGIN IDS_IMPORTERROR_STRING "Cannot import paths from the specified file" IDS_ERROR_INITIALIZING_COMMON_CONTROLS "Cannot initialize common controls. The application will now exit." IDS_ERROR_INITIALIZING_RICH_EDIT_CONTROL "Cannot initialize rich edit control. The application will now exit." + IDS_HDRRESULT_STRING "Response" + IDS_SOURCE_FILE_STRING "source" + IDS_DESTINATION_FILE_STRING "destination" + IDS_HDROPERATION_STRING "Operation" + IDS_HDRSYSTEMERROR_STRING "System error" + IDS_OPERATION_DELETEERROR "Delete" + IDS_OPERATION_SEEKERROR "Seek" + IDS_OPERATION_RESIZEERROR "Resize" + IDS_OPERATION_READERROR "Read" + IDS_OPERATION_WRITEERROR "Write" + IDS_OPERATION_FINALIZEERROR "Finalize" + IDS_OPERATION_FASTMOVEERROR "Fast move" + IDS_OPERATION_CREATEERROR "Create" END STRINGTABLE BEGIN + IDS_OPERATION_CHECKFORFREESPACE "Check for free space" + IDS_OPERATION_RETRIEVEFILEINFO "Retrieve file information" +END + +STRINGTABLE +BEGIN IDS_DATECREATED_STRING "Date of creation" IDS_DATELASTWRITE_STRING "Date of last write" IDS_DATEACCESSED_STRING "Date of last access"