Index: src/ch/resource.h
===================================================================
diff -u -N -rf8b6de9c28b2957db0b4e71efa11df8632e41261 -re6f64ea0eecaf86dfa1a42c80604d227b69be768
--- src/ch/resource.h	(.../resource.h)	(revision f8b6de9c28b2957db0b4e71efa11df8632e41261)
+++ src/ch/resource.h	(.../resource.h)	(revision e6f64ea0eecaf86dfa1a42c80604d227b69be768)
@@ -54,14 +54,16 @@
 #define IDD_FEEDBACK_REPLACE_DIALOG     214
 #define IDD_MSGBOX_DIALOG               215
 #define IDR_TASK_ADVANCED_MENU          216
-#define IDR_FEEDBACK_MASS_REPLACE_MENU  225
-#define IDR_FEEDBACK_MASS_SKIP_MENU     226
-#define IDR_FEEDBACK_MASS_RENAME_MENU   228
-#define IDR_FEEDBACK_MASS_RESUME_MENU   230
+#define IDR_ALREADYEXISTS_MASS_REPLACE_MENU 225
+#define IDR_ALREADYEXISTS_MASS_SKIP_MENU 226
+#define IDR_ALREADYEXISTS_MASS_RENAME_MENU 228
+#define IDR_ALREADYEXISTS_MASS_RESUME_MENU 230
 #define IDD_RULE_EDIT_ALREADYEXISTS_DIALOG 231
 #define IDD_RULE_EDIT_ERROR_DIALOG      232
 #define IDD_RULE_EDIT_NOTENOUGHSPACE_DIALOG 233
 #define IDD_RULE_EDIT_ALL_DIALOG        234
+#define IDR_ERROR_MASS_SKIP_MENU        237
+#define IDR_ERROR_MASS_RETRY_MENU       238
 #define IDC_PROGRAM_STATIC              1000
 #define IDC_ADDFILE_BUTTON              1002
 #define IDC_STATUS_LIST                 1003
@@ -91,11 +93,12 @@
 #define IDC_TASK_ADVANCED_BUTTON        1017
 #define IDC_PAUSE_BUTTON                1018
 #define IDC_STANDARD_CHECK              1019
-#define IDC_PAUSE_BUTTON2               1019
 #define IDC_CUSTOM_RULES_BUTTON         1019
 #define IDC_FORCEDIRECTORIES_CHECK      1020
+#define IDC_PAUSE_BUTTON2               1020
 #define IDC_RESUME_BUTTON               1021
 #define IDC_CANCEL_BUTTON               1022
+#define IDC_PAUSE_BUTTON3               1022
 #define IDC_ADVANCED_CHECK              1023
 #define IDC_BUFFERSIZES_BUTTON          1024
 #define IDC_ADDFILTER_BUTTON            1025
@@ -167,7 +170,9 @@
 #define IDC_FREESPACE_STATIC            1123
 #define IDC_DISK_STATIC                 1124
 #define IDC_REQUIRED_STATIC             1127
+#define IDC_REQUIRED_SPACE_STATIC       1127
 #define IDC_AVAILABLE_STATIC            1128
+#define IDC_AVAILABLE_SPACE_STATIC      1128
 #define IDC_TEST_BUTTON                 1129
 #define IDC_SOURCEFILENAME_EDIT         1130
 #define IDC_YESALL_BUTTON               1131
@@ -385,9 +390,12 @@
 #define IDC_UPDATECHANNEL_STATIC        1334
 #define IDC_SRC_FILENAME_EDIT           1340
 #define IDC_DST_FILENAME_EDIT           1341
+#define IDC_OPERATION_EDIT              1341
 #define IDC_SRC_FILESIZE_EDIT           1342
+#define IDC_SYSTEM_ERROR_EDIT           1342
 #define IDC_MODIFIEDDATE_EDIT           1343
 #define IDC_SRC_MODIFIEDDATE_EDIT       1343
+#define IDC_SECOND_FILENAME_EDIT        1343
 #define IDC_DST_FILESIZE_EDIT           1344
 #define IDC_DST_MODIFIEDDATE_EDIT       1345
 #define IDC_SRC_PATH_EDIT               1346
@@ -397,6 +405,7 @@
 #define IDC_SRC_NAME_STATIC             1378
 #define IDC_SRC_LOCATION_STATIC         1379
 #define IDC_SRC_SIZE_STATIC             1380
+#define IDC_SYSTEM_ERROR_STATIC         1380
 #define IDC_SRC_TIME_STATIC             1381
 #define IDC_DST_NAME_STATIC             1382
 #define IDC_DST_LOCATION_STATIC         1383
@@ -436,6 +445,13 @@
 #define IDC_DESTINATION_SIZE_STATIC     1416
 #define IDC_SOURCE_DATE_STATIC          1417
 #define IDC_DST_DATE_STATIC             1418
+#define IDC_ERROR_DETAILS_STATIC        1423
+#define IDC_NAMES_STATIC                1424
+#define IDC_FILENAME_EDIT               1425
+#define IDC_LOCATION_STATIC             1426
+#define IDC_REQUIRED_SPACE_HDR_STATIC   1427
+#define IDC_AVAILABLE_SPACE_HDR_STATIC  1428
+#define IDC_DETAILS_STATIC              1429
 #define IDS_APPNAME_STRING              5000
 #define IDS_PRIORITY0_STRING            5001
 #define IDS_PRIORITY1_STRING            5002
@@ -667,13 +683,10 @@
 #define IDS_BDDIR_STRING                13034
 #define IDS_BDTREE_STRING               13035
 #define IDS_BDNDSCONTAINER_STRING       13036
-#define IDS_INFO_REASON_STRING          13040
-#define IDS_INFO_FILE_STRING            13041
 #define IDS_TITLECOPY_STRING            13500
 #define IDS_TITLEMOVE_STRING            13501
 #define IDS_TITLEUNKNOWNOPERATION_STRING 13502
 #define IDS_MAINBROWSETEXT_STRING       13503
-#define IDS_INFO_TWO_FILE_STRING        13504
 #define IDS_OK_STRING                   13505
 #define IDS_CANCEL_STRING               13506
 #define IDS_YES_STRING                  13507
@@ -723,7 +736,6 @@
 #define IDS_OPERATION_CREATEERROR       15039
 #define IDS_OPERATION_CHECKFORFREESPACE 15040
 #define IDS_OPERATION_RETRIEVEFILEINFO  15041
-#define IDS_NERPATH_STRING              16500
 #define IDS_DATECREATED_STRING          18000
 #define IDS_DATELASTWRITE_STRING        18001
 #define IDS_DATEACCESSED_STRING         18002
@@ -812,15 +824,17 @@
 #define ID_FEEDBACK_RENAME_WHENNEWERTHANDESTINATION 32830
 #define ID_FEEDBACK_RENAME_WHENOLDERTHANDESTINATION 32831
 #define ID_FEEDBACK_RESUME_WHENFILEBIGGERTHANDESTINATION 32832
+#define ID_FEEDBACK_RETRY_WHEN_SAME_ERROR 32833
+#define ID_FEEDBACK_SKIP_WHEN_SAME_ERROR 32834
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        235
-#define _APS_NEXT_COMMAND_VALUE         32833
-#define _APS_NEXT_CONTROL_VALUE         1419
+#define _APS_NEXT_RESOURCE_VALUE        239
+#define _APS_NEXT_COMMAND_VALUE         32835
+#define _APS_NEXT_CONTROL_VALUE         1430
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif