Index: src/ch/resource.h
===================================================================
diff -u -N -rb9453afbc6264bc3f3c6a7f86fadab7744e0fb16 -r1c585b955eb548cbedc7d36f1ea5af484206e7eb
--- src/ch/resource.h	(.../resource.h)	(revision b9453afbc6264bc3f3c6a7f86fadab7744e0fb16)
+++ src/ch/resource.h	(.../resource.h)	(revision 1c585b955eb548cbedc7d36f1ea5af484206e7eb)
@@ -58,6 +58,10 @@
 #define IDR_FEEDBACK_MASS_SKIP_MENU     226
 #define IDR_FEEDBACK_MASS_RENAME_MENU   228
 #define IDR_FEEDBACK_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 IDC_PROGRAM_STATIC              1000
 #define IDC_ADDFILE_BUTTON              1002
 #define IDC_STATUS_LIST                 1003
@@ -76,7 +80,9 @@
 #define IDC_TASKCOUNT_PROGRESS          1010
 #define IDC_ADDDIR_BUTTON               1011
 #define IDC_CURRENTOBJECT_PROGRESS      1011
+#define IDC_FILE_ERROR_RULES_LIST       1011
 #define IDC_BUFFERSIZES_LIST            1012
+#define IDC_NOT_ENOUGH_SPACE_RULES_LIST 1012
 #define IDC_SET_BUFFERSIZE_BUTTON       1013
 #define IDC_FILTERS_CHECK               1014
 #define IDC_IGNOREFOLDERS_CHECK         1015
@@ -395,7 +401,39 @@
 #define IDC_DST_SIZE_STATIC             1384
 #define IDC_DST_TIME_STATIC             1385
 #define IDC_DST_RENAME_EDIT             1387
+#define IDC_FILTER_BY_SYSTEMERROR_EDIT  1387
 #define IDC_DST_RENAME_STATIC           1388
+#define IDC_ALREADY_EXISTS_CHANGE_BUTTON 1388
+#define IDC_ALREADY_EXISTS_REMOVE_BUTTON 1389
+#define IDC_FILE_ALREADY_EXISTS_STATIC  1390
+#define IDC_FILE_ERROR_RULES_STATIC     1391
+#define IDC_NOT_ENOUGH_SPACE_STATIC     1392
+#define IDC_FILE_ALREADY_EXISTS_RULES_LIST 1393
+#define IDC_ALREADY_EXISTS_ADD_BUTTON   1394
+#define IDC_FILE_ERROR_CHANGE_BUTTON    1395
+#define IDC_FILE_ERROR_REMOVE_BUTTON    1396
+#define IDC_FILE_ERROR_ADD_BUTTON       1397
+#define IDC_NOT_ENOUGH_SPACE_CHANGE_BUTTON 1398
+#define IDC_NOT_ENOUGH_SPACE_REMOVE_BUTTON 1399
+#define IDC_NOT_ENOUGH_SPACE_ADD_BUTTON 1400
+#define IDC_BOTTOM_BAR_STATIC           1401
+#define IDC_INCLUDE_MASK_CHECK          1402
+#define IDC_INCLUDE_MASK_COMBO          1403
+#define IDC_EXCLUDE_MASK_CHECK          1404
+#define IDC_EXCLUDE_MASK_COMBO          1405
+#define IDC_FILTER_BY_SIZE_CHECK        1406
+#define IDC_FILTER_BY_SIZE_COMBO        1407
+#define IDC_FILTER_BY_DATE_CHECK        1408
+#define IDC_FILTER_BY_DATE_COMBO        1409
+#define IDC_RESPONSE_STATIC             1410
+#define IDC_RESPONSE_COMBO              1411
+#define IDC_FILTER_BY_OPERATION_CHECK   1412
+#define IDC_FILTER_BY_OPERATION_COMBO   1413
+#define IDC_FILTER_BY_SYSTEMERROR_CHECK 1414
+#define IDC_SOURCE_SIZE_STATIC          1415
+#define IDC_DESTINATION_SIZE_STATIC     1416
+#define IDC_SOURCE_DATE_STATIC          1417
+#define IDC_DST_DATE_STATIC             1418
 #define IDS_APPNAME_STRING              5000
 #define IDS_PRIORITY0_STRING            5001
 #define IDS_PRIORITY1_STRING            5002
@@ -418,7 +456,8 @@
 #define IDS_EQ_STRING                   5019
 #define IDS_GE_STRING                   5020
 #define IDS_GT_STRING                   5021
-#define IDS_UPDATER_NEW_VERSION_STRING  5022
+#define IDS_DT_STRING                   5022
+#define IDS_UPDATER_NEW_VERSION_STRING  5023
 #define IDS_UPDATER_EQUAL_VERSION_STRING 5024
 #define IDS_UPDATER_ERROR_STRING        5025
 #define IDS_UPDATER_WAITING_STRING      5026
@@ -444,6 +483,17 @@
 #define IDS_UPDATER_NEWVERSIONEXISTS    5048
 #define IDS_UPDATER_RELEASENOTES        5049
 #define IDS_FINALIZE_CH_ERROR           5050
+
+#define IDS_FEEDBACK_RESPONSE_UNKNOWN   5051
+#define IDS_FEEDBACK_RESPONSE_OVERWRITE 5052
+#define IDS_FEEDBACK_RESPONSE_RESUME    5053
+#define IDS_FEEDBACK_RESPONSE_SKIP      5054
+#define IDS_FEEDBACK_RESPONSE_CANCEL    5055
+#define IDS_FEEDBACK_RESPONSE_PAUSE     5056
+#define IDS_FEEDBACK_RESPONSE_RETRY     5057
+#define IDS_FEEDBACK_RESPONSE_IGNORE    5058
+#define IDS_FEEDBACK_RESPONSE_RENAME    5059
+
 #define IDS_ONECOPY_STRING              6000
 #define IDS_REGISTEROK_STRING           6001
 #define IDS_REGISTERERR_STRING          6002
@@ -658,6 +708,23 @@
 #define IDS_IMPORTERROR_STRING          15024
 #define IDS_ERROR_INITIALIZING_COMMON_CONTROLS 15025
 #define IDS_ERROR_INITIALIZING_RICH_EDIT_CONTROL 15026
+#define IDS_HDRRESULT_STRING            15027
+#define IDS_SOURCE_FILE_STRING          15028
+#define IDS_DESTINATION_FILE_STRING     15029
+#define IDS_HDROPERATION_STRING         15030
+#define IDS_HDRSYSTEMERROR_STRING       15031
+
+#define IDS_OPERATION_DELETEERROR       15032
+#define IDS_OPERATION_SEEKERROR         15033
+#define IDS_OPERATION_RESIZEERROR       15034
+#define IDS_OPERATION_READERROR         15035
+#define IDS_OPERATION_WRITEERROR        15036
+#define IDS_OPERATION_FINALIZEERROR     15037
+#define IDS_OPERATION_FASTMOVEERROR     15038
+#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
@@ -753,9 +820,9 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        231
+#define _APS_NEXT_RESOURCE_VALUE        235
 #define _APS_NEXT_COMMAND_VALUE         32833
-#define _APS_NEXT_CONTROL_VALUE         1387
+#define _APS_NEXT_CONTROL_VALUE         1419
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif