#define IDR_POPUP_MERGEVIEW 104\r
#define IDR_POPUP_DIRVIEW 105\r
#define IDR_POPUP_LOCATIONBAR 106\r
-#define IDD_SAVECLOSING 107\r
#define IDR_MERGEDOCTYPE 109\r
#define IDR_DIRDOCTYPE 110\r
#define IDR_POPUP_DIFF_OPTIONS 113\r
#define IDR_POPUP_IMGMERGEVIEW 114\r
#define IDR_POPUP_PROJECT 115\r
+#define IDR_POPUP_MERGEEDITFRAME_STATUSBAR_EOL 116\r
+#define IDR_POPUP_NEW 117\r
+#define IDR_POPUP_OPEN 118\r
+#define IDR_POPUP_COMPARE 119\r
+#define IDR_POPUP_SAVE 120\r
#define IDD_ABOUTBOX 200\r
#define IDD_OPEN 202\r
-#define IDD_PROPPAGE_GENERAL 205\r
-#define IDD_PROPPAGE_FILTER 207\r
-#define IDD_PROPPAGE_SYSTEM 209\r
+#define IDD_SAVECLOSING 203\r
#define IDD_EDITOR_HEADERBAR 210\r
#define IDD_GENERATE_PATCH 211\r
#define IDD_DIRCOLS 212\r
-#define IDD_SELECTUNPACKER 213\r
#define IDD_DIRCOMP_PROGRESS 214\r
#define IDD_WMGOTO 215\r
-#define IDD_PROPPAGE_COMPARE 216\r
-#define IDD_PROPPAGE_EDITOR 217\r
-#define IDD_FILEFILTERS 218\r
#define IDD_MESSAGE_BOX 219\r
-#define IDD_EDIT_FIND 220\r
-#define IDD_EDIT_REPLACE 221\r
-#define IDD_PROPPAGE_COLORS_WINMERGE 222\r
-#define IDD_PROPPAGE_CODEPAGE 223\r
#define IDD_PREFERENCES 224\r
-#define IDD_PROPPAGE_COLORS_SYNTAX 225\r
#define IDD_DIRCMP_REPORT 226\r
-#define IDD_SHARED_FILTER 227\r
-#define IDD_PROP_ARCHIVE 228\r
#define IDD_COMPARE_STATISTICS 229\r
#define IDD_COMPARE_STATISTICS3 230\r
#define IDD_LOAD_SAVE_CODEPAGE 231\r
-#define IDD_TEST_FILTER 232\r
-#define IDD_PROPPAGE_COLORS_TEXT 233\r
-#define IDD_PROPPAGE_BACKUPS 235\r
#define IDD_CONFIRM_COPY 236\r
#define IDD_PLUGINS_LIST 237\r
-#define IDD_PROPPAGE_SHELL 238\r
-#define IDD_PROPPAGE_COMPARE_FOLDER 239\r
+#define IDD_PLUGINS_SELECTPLUGIN 238\r
#define IDD_DIR_FILTER 240\r
#define IDD_ENCODINGERROR 241\r
-#define IDD_PROPPAGE_COMPARE_IMAGE 242\r
-#define IDD_PROPPAGE_COMPARE_BINARY 243\r
-#define IDD_PROPPAGE_COLORS_MARKER 244\r
-#define IDD_EDIT_MARKER 245\r
-#define IDD_PROPPAGE_COLORS_DIR 246\r
+#define IDD_SELECT_FILES_OR_FOLDERS 247\r
+#define IDD_DIALOG_WINDOWSMANAGER 251\r
+#define IDD_OPEN_TABLE 252\r
+#define IDD_FILTERS_FILEFILTERS 255\r
+#define IDD_FILTERS_LINEFILTERS 256\r
+#define IDD_FILTERS_SUBSTITUTIONFILTERS 257\r
+#define IDD_FILTERS_FILEFILTERS_SHARED 258\r
+#define IDD_FILTERS_FILEFILTERS_TEST 259\r
+#define IDD_PROPPAGE_ARCHIVE 260\r
+#define IDD_PROPPAGE_BACKUPS 261\r
+#define IDD_PROPPAGE_CODEPAGE 262\r
+#define IDD_PROPPAGE_COLOR_SCHEMES 263\r
+#define IDD_PROPPAGE_COLORS_DIR 264\r
+#define IDD_PROPPAGE_COLORS_MARKER 265\r
+#define IDD_PROPPAGE_COLORS_SYNTAX 266\r
+#define IDD_PROPPAGE_COLORS_TEXT 267\r
+#define IDD_PROPPAGE_COLORS_WINMERGE 268\r
+#define IDD_PROPPAGE_COMPARE 269\r
+#define IDD_PROPPAGE_COMPARE_BINARY 270\r
+#define IDD_PROPPAGE_COMPARE_FOLDER 271\r
+#define IDD_PROPPAGE_COMPARE_IMAGE 272\r
+#define IDD_PROPPAGE_COMPARE_TABLE 273\r
+#define IDD_PROPPAGE_EDITOR 274\r
+#define IDD_PROPPAGE_EDITOR_SYNTAX 275\r
+#define IDD_PROPPAGE_GENERAL 276\r
+#define IDD_PROPPAGE_SHELL 277\r
+#define IDD_PROPPAGE_SYSTEM 278\r
+#define IDD_EDIT_FIND 280\r
+#define IDD_EDIT_MARKER 281\r
+#define IDD_EDIT_REPLACE 282\r
#define IDI_ROTATE2 302\r
#define IDR_LOGO 307\r
#define IDR_SPLASH 308\r
-#define IDB_WINMERGE 309\r
+#define IDR_MARGIN_ICONS_PNG 310\r
#define IDB_EDIT_COPY 316\r
#define IDB_EDIT_CUT 317\r
#define IDB_EDIT_PASTE 318\r
#define IDB_COPY_FROM_LEFT 376\r
#define IDB_COPY_FROM_RIGHT 377\r
#define IDB_TOOLBAR_ENABLED 378\r
-#define IDB_TOOLBAR_ENABLED_MASK 379\r
-#define IDB_TOOLBAR_ENABLED_MASK32 380\r
+#define IDB_FILE_NEW_TABLE 379\r
+#define IDB_FILE_NEW_HEX 380\r
+#define IDB_FILE_NEW_IMAGE 381\r
+#define IDB_FILE_NEW3_TABLE 382\r
+#define IDB_FILE_NEW3_HEX 383\r
+#define IDB_FILE_NEW3_IMAGE 384\r
+#define IDB_COPY_SELECTED_LINES_TO_LEFT 385\r
+#define IDB_COPY_SELECTED_LINES_TO_RIGHT 386\r
+#define IDB_COPY_SELECTED_LINES_FROM_LEFT 387\r
+#define IDB_COPY_SELECTED_LINES_FROM_RIGHT 388\r
#define IDI_FOLDER 500\r
#define IDI_LFOLDER 501\r
#define IDI_MFOLDER 502\r
#define IDI_COMPARE_ERROR 513\r
#define IDI_FOLDERUP 514\r
#define IDI_FOLDERUP_DISABLE 515\r
-#define IDI_SIGMA 516\r
#define IDI_FILEFILTER 517\r
#define IDI_LINEFILTER 518\r
#define IDI_COMPARE_ABORTED 519\r
#define IDI_TREE_STATE_COLLAPSED 532\r
#define IDI_TREE_STATE_EXPANDED 533\r
#define IDI_FILE 534\r
+// CONTROLS\r
#define IDC_PATH0_BUTTON 1001\r
#define IDC_PATH1_BUTTON 1002\r
#define IDC_PATH2_BUTTON 1003\r
#define IDC_PATH0_COMBO 1004\r
#define IDC_PATH1_COMBO 1005\r
#define IDC_PATH2_COMBO 1006\r
-#define IDC_MESSAGE 1008\r
#define IDC_EXT_COMBO 1009\r
-#define IDC_PATH_EDIT 1010\r
-#define IDC_BROWSE_BUTTON 1011\r
#define IDC_SCROLL_CHECK 1012\r
+#define IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK 1013\r
#define IDC_RECURS_CHECK 1015\r
#define IDC_VERSION 1016\r
#define IDC_IGNBLANKS_CHECK 1017\r
#define IDC_WWW 1019\r
#define IDC_IGNCASE_CHECK 1020\r
#define IDC_COMPANY 1021\r
-#define IDC_VER_SYS 1024\r
+#define IDC_GNU_ASCII 1022\r
#define IDC_HILITE_CHECK 1025\r
#define IDC_IGNOREREGEXP 1026\r
#define IDC_ALL_WHITE 1027\r
#define IDC_WHITE_CHANGE 1028\r
#define IDC_WHITESPACE 1029\r
+#define IDC_IGNORED_SUSBSTITUTIONS_ENABLED 1030\r
#define IDC_EOL_SENSITIVE 1032\r
#define IDC_CP_SENSITIVE 1033\r
#define IDC_DIFFERENCE_COLOR 1035\r
#define IDC_DIFF_FILERESULT 1067\r
#define IDC_DIFF_STYLE 1068\r
#define IDC_DIFF_CONTEXT 1069\r
-#define IDC_DIFF_CASESENSITIVE 1070\r
+#define IDC_DIFF_IGNORECASE 1070\r
#define IDC_DIFF_WHITESPACE_IGNOREBLANKS 1071\r
#define IDC_DIFF_WHITESPACE_COMPARE 1072\r
#define IDC_DIFF_WHITESPACE_IGNORE 1073\r
#define IDC_FILES_DIRS_GROUP2 1084\r
#define IDC_FILES_DIRS_GROUP3 1085\r
#define IDC_FILES_DIRS_GROUP4 1086\r
-#define IDC_UNPACKER_NAME 1089\r
-#define IDC_UNPACKER_ALLOW_ALL 1090\r
-#define IDC_UNPACKER_SUPPORTED_EXTENSIONS 1091\r
-#define IDC_UNPACKER_DESCRIPTION 1092\r
-#define IDC_UNPACKER_EDIT 1093\r
-#define IDC_SELECT_UNPACKER 1094\r
-#define IDC_EXT_EDITOR_BROWSE 1095\r
-#define IDC_EXT_EDITOR_PATH 1096\r
-#define IDC_DIFF_SWAPFILES 1097\r
-#define IDC_DIFF_OPENTOEDITOR 1098\r
-#define IDC_FILES_DIRS_GROUP3X 1100\r
-#define IDC_FILES_DIRS_GROUP4X 1101\r
+#define IDC_PLUGIN_NAME 1087\r
+#define IDC_PLUGIN_ALLOW_ALL 1088\r
+#define IDC_PLUGIN_SUPPORTED_EXTENSIONS 1089\r
+#define IDC_PLUGIN_DESCRIPTION 1090\r
+#define IDC_PLUGIN_ARGUMENTS 1091\r
+#define IDC_PLUGIN_COMBO 1092\r
+#define IDC_PLUGIN_PIPELINE 1093\r
+#define IDC_PLUGIN_ADDPIPE 1094\r
+#define IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE 1095\r
+#define IDC_UNPACKER_COMBO 1096\r
+#define IDC_SELECT_UNPACKER 1097\r
+#define IDC_EXT_EDITOR_BROWSE 1098\r
+#define IDC_EXT_EDITOR_PATH 1099\r
+#define IDC_DIFF_SWAPFILES 1100\r
+#define IDC_DIFF_OPENTOEDITOR 1101\r
+#define IDC_FILES_DIRS_GROUP3X 1102\r
+#define IDC_FILES_DIRS_GROUP4X 1103\r
#define IDC_COMPARISON_STOP 1105\r
#define IDC_COMPARISON_PAUSE 1106\r
#define IDC_COMPARISON_CONTINUE 1107\r
#define IDC_OPEN_CONTRIBUTORS 1115\r
#define IDC_COMPAREMETHODCOMBO 1116\r
#define IDC_USE_RECYCLE_BIN 1117\r
-#define IDC_COLORDEFAULTS_BTN 1118\r
#define IDC_COMPARE_DEFAULTS 1119\r
#define IDC_DIFF_DEFAULTS 1122\r
#define IDC_MOVED_BLOCKS 1123\r
#define IDC_SCOLOR_NUMBERS 1184\r
#define IDC_SCOLOR_OPERATORS 1185\r
#define IDC_SCOLOR_STRINGS 1186\r
-#define IDC_SCOLORS_BDEFAULTS 1187\r
#define IDC_SCOLOR_PREPROCESSOR 1188\r
#define IDC_SCOLOR_USER1 1189\r
#define IDC_SCOLOR_USER2 1190\r
#define IDC_STAT_IDENTICFOLDER 1213\r
#define IDC_STAT_IDENTICFILE 1214\r
#define IDC_STAT_IDENTICBINARY 1215\r
-#define IDC_STAT_DIFFFILE 1216\r
-#define IDC_STAT_DIFFBINARY 1217\r
-#define IDC_STAT_LUNIQFOLDER 1218\r
-#define IDC_STAT_LUNIQFILE 1219\r
-#define IDC_STAT_RUNIQFOLDER 1220\r
-#define IDC_STAT_RUNIQFILE 1221\r
-#define IDC_STAT_MUNIQFOLDER 1222\r
-#define IDC_STAT_MUNIQFILE 1223\r
-#define IDC_STAT_LMISSINGFOLDER 1224\r
-#define IDC_STAT_LMISSINGFILE 1225\r
-#define IDC_STAT_RMISSINGFOLDER 1226\r
-#define IDC_STAT_RMISSINGFILE 1227\r
-#define IDC_STAT_MMISSINGFOLDER 1228\r
-#define IDC_STAT_MMISSINGFILE 1229\r
-#define IDC_STAT_TOTALFOLDER 1230\r
-#define IDC_STAT_TOTALFILE 1231\r
-#define IDC_TREEOPT_IMPORT 1232\r
-#define IDC_TREEOPT_EXPORT 1233\r
-#define IDC_STAT_ILUNIQFOLDER 1234\r
-#define IDC_STAT_IRUNIQFOLDER 1235\r
-#define IDC_STAT_IMUNIQFOLDER 1236\r
-#define IDC_STAT_ILMISSINGFOLDER 1237\r
-#define IDC_STAT_IRMISSINGFOLDER 1238\r
-#define IDC_STAT_IMMISSINGFOLDER 1239\r
-#define IDC_STAT_IIDENTICFOLDER 1240\r
-#define IDC_STAT_INOTEQUAL 1241\r
-#define IDC_STAT_IDIFFBINFILE 1242\r
-#define IDC_STAT_ILUNIQFILE 1243\r
-#define IDC_STAT_IRUNIQFILE 1244\r
-#define IDC_STAT_IMUNIQFILE 1245\r
-#define IDC_STAT_ILMISSINGFILE 1246\r
-#define IDC_STAT_IRMISSINGFILE 1247\r
-#define IDC_STAT_IMMISSINGFILE 1248\r
-#define IDC_STAT_IEQUALFILE 1249\r
-#define IDC_STAT_IEQUALBINFILE 1250\r
-#define IDC_EDITOR_CHARLEVEL 1251\r
-#define IDC_EDITOR_WORDLEVEL 1252\r
-#define IDC_AFFECTS_GROUP 1253\r
-#define IDC_AFFECTS_LEFT_BTN 1254\r
-#define IDC_AFFECTS_MIDDLE_BTN 1255\r
-#define IDC_AFFECTS_RIGHT_BTN 1256\r
-#define IDC_LOAD_FILES_LABEL 1257\r
-#define IDC_LOAD_CODEPAGE_TEXTBOX 1258\r
-#define IDC_LOAD_SAVE_SAME_CODEPAGE 1259\r
-#define IDC_SAVE_FILES_LABEL 1260\r
-#define IDC_SAVE_CODEPAGE_TEXTBOX 1261\r
-#define IDC_LOADING_GROUP 1262\r
-#define IDC_LEFT_FILES_LABEL 1264\r
-#define IDC_MIDDLE_FILES_LABEL 1265\r
-#define IDC_RIGHT_FILES_LABEL 1266\r
-#define IDC_FILTERFILE_TEST_BTN 1267\r
-#define IDC_HEADER 1268\r
-#define IDC_PROMPT_LABEL 1269\r
-#define IDC_TEST_BTN 1270\r
-#define IDC_TEST_TEXT 1271\r
-#define IDC_RESULTS 1272\r
-#define IDC_IS_DIRECTORY 1273\r
-#define IDC_HEADER_FILTER_NAME 1274\r
-#define IDC_DEFAULT_STANDARD_COLORS 1275\r
-#define IDC_CUSTOM_COLORS_GROUP 1276\r
-#define IDC_WHITESPACE_COLOR_LABEL 1277\r
-#define IDC_TEXT_COLOR_LABEL 1278\r
-#define IDC_SELECTION_COLOR_LABEL 1279\r
-#define IDC_TEXT_COLUMN_LABEL 1280\r
-#define IDC_BACKGROUND_COLUMN_LABEL 1281\r
-#define IDC_WHITESPACE_BKGD_COLOR 1282\r
-#define IDC_REGULAR_BKGD_COLOR 1283\r
-#define IDC_SELECTION_BKGD_COLOR 1284\r
-#define IDC_SELECTION_TEXT_COLOR 1285\r
-#define IDC_REGULAR_TEXT_COLOR 1286\r
-#define IDC_AUTO_COMPLETE_SOURCE 1287\r
+#define IDC_STAT_DIFFFOLDER 1216\r
+#define IDC_STAT_DIFFFILE 1217\r
+#define IDC_STAT_DIFFBINARY 1218\r
+#define IDC_STAT_LUNIQFOLDER 1219\r
+#define IDC_STAT_LUNIQFILE 1220\r
+#define IDC_STAT_RUNIQFOLDER 1221\r
+#define IDC_STAT_RUNIQFILE 1222\r
+#define IDC_STAT_MUNIQFOLDER 1223\r
+#define IDC_STAT_MUNIQFILE 1224\r
+#define IDC_STAT_LMISSINGFOLDER 1225\r
+#define IDC_STAT_LMISSINGFILE 1226\r
+#define IDC_STAT_RMISSINGFOLDER 1227\r
+#define IDC_STAT_RMISSINGFILE 1228\r
+#define IDC_STAT_MMISSINGFOLDER 1229\r
+#define IDC_STAT_MMISSINGFILE 1230\r
+#define IDC_STAT_TOTALFOLDER 1231\r
+#define IDC_STAT_TOTALFILE 1232\r
+#define IDC_TREEOPT_IMPORT 1233\r
+#define IDC_TREEOPT_EXPORT 1234\r
+#define IDC_STAT_ILUNIQFOLDER 1235\r
+#define IDC_STAT_IRUNIQFOLDER 1236\r
+#define IDC_STAT_IMUNIQFOLDER 1237\r
+#define IDC_STAT_ILMISSINGFOLDER 1238\r
+#define IDC_STAT_IRMISSINGFOLDER 1239\r
+#define IDC_STAT_IMMISSINGFOLDER 1240\r
+#define IDC_STAT_IIDENTICFOLDER 1241\r
+#define IDC_STAT_INOTEQUAL 1242\r
+#define IDC_STAT_INOTEQUALFOLDER 1243\r
+#define IDC_STAT_IDIFFBINFILE 1244\r
+#define IDC_STAT_ILUNIQFILE 1245\r
+#define IDC_STAT_IRUNIQFILE 1246\r
+#define IDC_STAT_IMUNIQFILE 1247\r
+#define IDC_STAT_ILMISSINGFILE 1248\r
+#define IDC_STAT_IRMISSINGFILE 1249\r
+#define IDC_STAT_IMMISSINGFILE 1250\r
+#define IDC_STAT_IEQUALFILE 1251\r
+#define IDC_STAT_IEQUALBINFILE 1252\r
+#define IDC_EDITOR_CHARLEVEL 1253\r
+#define IDC_EDITOR_WORDLEVEL 1254\r
+#define IDC_AFFECTS_GROUP 1255\r
+#define IDC_AFFECTS_LEFT_BTN 1256\r
+#define IDC_AFFECTS_MIDDLE_BTN 1257\r
+#define IDC_AFFECTS_RIGHT_BTN 1258\r
+#define IDC_LOAD_FILES_LABEL 1259\r
+#define IDC_LOAD_CODEPAGE_TEXTBOX 1260\r
+#define IDC_LOAD_SAVE_SAME_CODEPAGE 1261\r
+#define IDC_SAVE_FILES_LABEL 1262\r
+#define IDC_SAVE_CODEPAGE_TEXTBOX 1264\r
+#define IDC_LOADING_GROUP 1265\r
+#define IDC_LEFT_FILES_LABEL 1266\r
+#define IDC_MIDDLE_FILES_LABEL 1267\r
+#define IDC_RIGHT_FILES_LABEL 1268\r
+#define IDC_FILTERFILE_TEST_BTN 1269\r
+#define IDC_HEADER 1270\r
+#define IDC_PROMPT_LABEL 1271\r
+#define IDC_TEST_BTN 1272\r
+#define IDC_TEST_TEXT 1273\r
+#define IDC_RESULTS 1274\r
+#define IDC_IS_DIRECTORY 1275\r
+#define IDC_HEADER_FILTER_NAME 1276\r
+#define IDC_DEFAULT_STANDARD_COLORS 1277\r
+#define IDC_WHITESPACE_COLOR_LABEL 1279\r
+#define IDC_TEXT_COLOR_LABEL 1280\r
+#define IDC_SELECTION_COLOR_LABEL 1281\r
+#define IDC_TEXT_COLUMN_LABEL 1282\r
+#define IDC_BACKGROUND_COLUMN_LABEL 1283\r
+#define IDC_WHITESPACE_BKGD_COLOR 1284\r
+#define IDC_REGULAR_BKGD_COLOR 1285\r
+#define IDC_SELECTION_BKGD_COLOR 1286\r
+#define IDC_SELECTION_TEXT_COLOR 1287\r
+#define IDC_REGULAR_TEXT_COLOR 1288\r
+#define IDC_AUTO_COMPLETE_SOURCE 1289\r
#define IDC_FILTER_USER_BROWSE 1297\r
#define IDC_FILTER_USER_PATH 1298\r
#define IDC_FILTERCOMMENTS_CHECK 1299\r
#define IDC_LFILTER_ADDBTN 1321\r
#define IDC_LFILTER_EDITBTN 1322\r
#define IDC_LFILTER_REMOVEBTN 1323\r
-#define IDC_ABOUTBOX_ICON 1325\r
+#define IDC_SUBSTITUTION_FILTERS 1324\r
+#define IDC_SAVE_CODEPAGE_BOM 1325\r
#define IDC_ASK_MULTIWINDOW_CLOSE 1326\r
#define IDC_COLDLG_LIST 1327\r
#define IDC_PRESERVE_FILETIME 1328\r
#define IDC_BREAK_CHARS 1335\r
#define IDC_WORDDIFF_DELETED_COLOR 1336\r
#define IDC_SEL_WORDDIFF_DELETED_COLOR 1337\r
-#define IDC_COMPAREFOLDER_DEFAULTS 1338\r
#define IDC_COMPARE_WALKSUBDIRS 1339\r
#define IDC_COMPARE_QUICKC_LIMIT 1340\r
#define IDC_REPORT_INCLUDEFILECMPREPORT 1341\r
#define IDC_SWAP01_BUTTON 1343\r
#define IDC_SWAP12_BUTTON 1344\r
#define IDC_SWAP02_BUTTON 1345\r
-#define IDC_COLORSCHEME_GITHUBBITBUCKET 1346\r
#define IDC_FINDDLG_DONTCLOSE 1347\r
#define IDC_PATH_COMPARING 1348\r
#define IDC_REGISTER_SHELLEXTENSION 1349\r
#define IDC_DIR_ITEM_EQUAL_COLOR 1362\r
#define IDC_DIR_ITEM_EQUAL_TEXT_COLOR 1363\r
#define IDC_USE_DIR_COMPARE_COLORS 1364\r
+#define IDC_PLUGIN_FILEFILTERS 1365\r
+#define IDC_PLUGIN_DEFAULTS 1366\r
+#define IDC_PLUGIN_AUTOMATIC 1367\r
+#define IDC_RENDERING_MODE 1368\r
+#define IDC_DIFF_IGNORECP 1377\r
+#define IDC_RESET 1378\r
+#define IDC_LEFT1 1379\r
+#define IDC_MIDDLE1 1380\r
+#define IDC_RIGHT1 1381\r
+#define IDC_LEFT2 1382\r
+#define IDC_MIDDLE2 1383\r
+#define IDC_RIGHT2 1384\r
+#define IDC_LEFT3 1385\r
+#define IDC_MIDDLE3 1386\r
+#define IDC_RIGHT3 1387\r
+#define IDC_FIRST 1388\r
+#define IDC_SECOND 1389\r
+#define IDC_THIRD 1390\r
+#define IDC_COLOR_SCHEMES 1391\r
+#define IDC_DIR_MARGIN_COLOR 1392\r
+#define IDC_SYNTAX_LIST 1393\r
+#define IDC_COMPAREIMAGE_PATTERNS 1394\r
+#define IDC_PLUGIN_SETTINGS 1395\r
+#define IDC_COMPAREIMAGE_OCR_RESULT_TYPE 1396\r
+#define IDC_COMPAREBINARY_PATTERNS 1397\r
+#define IDC_COMPAREBINARY_VIEWSETTINGS 1398\r
+#define IDC_COMPAREBINARY_BINARYMODE 1399\r
+#define IDC_COMPAREBINARY_CHARACTERSET 1400\r
+#define IDC_ENABLE_IMGCMP_IN_DIRCMP 1401\r
+#define IDC_COMPARETABLE_CSV 1402\r
+#define IDC_COMPARETABLE_TSV 1403\r
+#define IDC_COMPARETABLE_DSV 1404\r
+#define IDC_COMPARETABLE_CSV_PATTERNS 1405\r
+#define IDC_COMPARETABLE_TSV_PATTERNS 1406\r
+#define IDC_COMPARETABLE_DSV_PATTERNS 1407\r
+#define IDC_COMPARETABLE_DSV_DELIM_CHAR 1408\r
+#define IDC_COMPARETABLE_ALLOWNEWLINE 1409\r
+#define IDC_COMPARETABLE_QUOTE_CHAR 1410\r
+#define IDC_OPTIONS 1411\r
+#define IDC_SWAP01_STATIC 1412\r
+#define IDC_SWAP12_STATIC 1413\r
+#define IDC_SWAP02_STATIC 1414\r
+#define IDC_DIFF_ALGORITHM 1415\r
+#define IDC_INDENT_HEURISTIC 1416\r
+#define IDC_LIST_FILE 1417\r
+#define IDC_FLDCONFIRM_DONTASKAGAIN 1418\r
+#define IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES 1419\r
+#define IDC_LFILTER_CLEARBTN 1420\r
+#define IDC_EXPAND_SUBDIRS 1600\r
+#define IDC_FILEENCODING 1601\r
+#define IDC_PLUGIN 1602\r
+#define IDC_HEXVIEW 1603\r
+#define IDC_IGNORE_REPARSEPOINTS 1604\r
+#define IDC_CLOSE_WITH_OK 1605\r
+#define IDC_PATH0_READONLY 1606\r
+#define IDC_PATH1_READONLY 1607\r
+#define IDC_PATH2_READONLY 1608\r
+#define IDC_MARKER0_COLOR_LABEL 1611\r
+#define IDC_MARKER1_COLOR_LABEL 1612\r
+#define IDC_MARKER2_COLOR_LABEL 1613\r
+#define IDC_MARKER3_COLOR_LABEL 1614\r
+#define IDC_MARKER0_BKGD_COLOR 1615\r
+#define IDC_MARKER1_BKGD_COLOR 1616\r
+#define IDC_MARKER2_BKGD_COLOR 1617\r
+#define IDC_MARKER3_BKGD_COLOR 1618\r
+// CrystalEdit dialog controls\r
#define IDC_EDIT_WHOLE_WORD 8603\r
#define IDC_EDIT_MATCH_CASE 8604\r
#define IDC_EDIT_FINDTEXT 8605\r
#define IDC_EDIT_SCOPE_WHOLE_FILE 8614\r
#define IDC_EDIT_SCOPE_DONT_WRAP 8615\r
#define IDC_EDIT_FINDPREV 8616\r
-#define IDC_SCRIPT_FIRST 8700\r
-#define IDC_SCRIPT_LAST 8749\r
-#define IDC_PREDIFFERS_FIRST 8750\r
-#define IDC_PREDIFFERS_LAST 8799\r
-#define IDC_EXPAND_SUBDIRS 8800\r
-#define IDC_FILEENCODING 8801\r
-#define IDC_PLUGIN 8802\r
-#define IDC_HEXVIEW 8803\r
-#define IDC_IGNORE_REPARSEPOINTS 8804\r
-#define IDC_CLOSE_WITH_OK 8805\r
-#define IDC_PATH0_READONLY 8806\r
-#define IDC_PATH1_READONLY 8807\r
-#define IDC_PATH2_READONLY 8808\r
-#define IDC_MARKER_COLORS_GROUP 8810\r
-#define IDC_MARKER0_COLOR_LABEL 8811\r
-#define IDC_MARKER1_COLOR_LABEL 8812\r
-#define IDC_MARKER2_COLOR_LABEL 8813\r
-#define IDC_MARKER3_COLOR_LABEL 8814\r
-#define IDC_MARKER0_BKGD_COLOR 8815\r
-#define IDC_MARKER1_BKGD_COLOR 8816\r
-#define IDC_MARKER2_BKGD_COLOR 8817\r
-#define IDC_MARKER3_BKGD_COLOR 8818\r
#define IDC_EDIT_MARKERS_ENABLED 8819\r
#define IDC_EDIT_MARKER_LIST 8820\r
#define IDC_EDIT_MARKER_BGCOLORIDX 8821\r
#define IDC_EDIT_MARKER_NEW 8822\r
#define IDC_EDIT_MARKER_DELETE 8823\r
-#define IDC_OPTIONS 8824\r
-#define IDC_SWAP01_STATIC 8825\r
-#define IDC_SWAP12_STATIC 8826\r
-#define IDC_SWAP02_STATIC 8827\r
-#define IDC_DIFF_ALGORITHM 8828\r
-#define IDC_INDENT_HEURISTIC 8829\r
-#define IDS_SPLASH_DEVELOPERS 8976\r
-#define IDS_SPLASH_GPLTEXT 8977\r
-#define IDS_MESSAGEBOX_OK 9001\r
-#define IDS_MESSAGEBOX_CANCEL 9002\r
-#define IDS_MESSAGEBOX_ABORT 9003\r
-#define IDS_MESSAGEBOX_RETRY 9004\r
-#define IDS_MESSAGEBOX_IGNORE 9005\r
-#define IDS_MESSAGEBOX_IGNOREALL 9006\r
-#define IDS_MESSAGEBOX_YES 9007\r
-#define IDS_MESSAGEBOX_YES_TO_ALL 9008\r
-#define IDS_MESSAGEBOX_NO 9009\r
-#define IDS_MESSAGEBOX_NO_TO_ALL 9010\r
-#define IDS_MESSAGEBOX_CONTINUE 9011\r
-#define IDS_MESSAGEBOX_SKIP 9012\r
-#define IDS_MESSAGEBOX_SKIPALL 9013\r
-#define IDS_MESSAGEBOX_HELP 9014\r
-#define IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN 9015\r
-#define IDS_MESSAGEBOX_DONT_ASK_AGAIN 9016\r
-#define IDS_MESSAGEBOX_CHECKBOX_TOOLTIP 9017\r
-#define IDS_OPTIONSPG_GENERAL 9041\r
-#define IDS_OPTIONSPG_COMPARE 9042\r
-#define IDS_OPTIONSPG_EDITOR 9043\r
-#define IDS_OPTIONSPG_COLORS 9044\r
-#define IDS_OPTIONSPG_TEXTCOLORS 9045\r
-#define IDS_OPTIONSPG_SYNTAXCOLORS 9046\r
-#define IDS_OPTIONSPG_MARKERCOLORS 9047\r
-#define IDS_OPTIONSPG_SYSTEM 9048\r
-#define IDS_OPTIONSPG_CODEPAGE 9050\r
-#define IDS_OPTIONSPG_ARCHIVE 9051\r
-#define IDS_OPTIONSPG_BACKUPS 9052\r
-#define IDS_OPTIONSPG_SHELL 9053\r
-#define IDS_OPTIONSPG_MERGECOLORS 9054\r
-#define IDS_OPTIONSPG_GENCOMPARE 9055\r
-#define IDS_OPTIONSPG_FOLDERCOMPARE 9056\r
-#define IDS_OPTIONSPG_IMAGECOMPARE 9057\r
-#define IDS_OPTIONSPG_BINARYCOMPARE 9058\r
-#define IDS_OPTIONSPG_DIRCOLORS 9059\r
-#define IDS_TO 16000\r
-#define IDS_FROM_LEFT 16001\r
-#define IDS_TO_LEFT 16002\r
-#define IDS_FROM_RIGHT 16003\r
-#define IDS_TO_RIGHT 16004\r
-#define IDS_VERSION_FMT 16385\r
-#define IDS_WINX64 16388\r
-#define IDS_OPTIONS_TITLE 16400\r
-#define IDS_MESSAGE_BOX_ARE_RESET 16401\r
-#define IDS_OPTIONS_INVALID_TABSIZE 16404\r
-#define IDS_OPEN_TITLE 16416\r
-#define IDS_PROGRAMFILES 16417\r
-#define IDS_ALLFILES 16418\r
-#define IDS_PROJECTFILES 16419\r
-#define IDS_PROJECTFILES_EXT 16420\r
-#define IDS_INIFILES 16421\r
-#define ID_COMPMETHOD_FULL_CONTENTS 16432\r
-#define ID_COMPMETHOD_QUICK_CONTENTS 16433\r
-#define ID_COMPMETHOD_BINARY_CONTENTS 16434\r
-#define ID_COMPMETHOD_MODDATE 16435\r
-#define ID_COMPMETHOD_DATESIZE 16436\r
-#define ID_COMPMETHOD_SIZE 16437\r
-#define IDS_FILTERFILE_NAMETITLE 16448\r
-#define IDS_FILTERFILE_PATHTITLE 16449\r
-#define IDS_FILTER_TITLE 16450\r
-#define IDS_FILTER_PREFIX 16451\r
-#define IDS_FILTERFILE_DESCTITLE 16452\r
-#define IDS_FILEFILTER_SAVENEW 16453\r
-#define IDS_FILEFILTER_FILEMASK 16454\r
-#define IDS_FILEFILTER_TMPL_MISSING 16455\r
-#define IDS_FILEFILTER_TMPL_COPY 16456\r
-#define IDS_FILEFILTER_NO_USERFOLDER 16457\r
-#define IDS_FILEFILTER_DELETE_FAIL 16458\r
-#define IDS_FILEFILTER_INSTALL 16459\r
-#define IDS_FILEFILTER_INSTALLFAIL 16460\r
-#define IDS_FILEFILTER_OVERWRITE 16461\r
-#define IDS_FILTERLINE_REGEXP 16480\r
-#define IDS_FILTERCHANGED 16496\r
-#define IDS_DIRECTORY_WINDOW_TITLE 16800\r
-#define IDS_FILE_COMPARISON_TITLE 16801\r
-#define IDS_EMPTY_LEFT_FILE 16802\r
-#define IDS_EMPTY_MIDDLE_FILE 16803\r
-#define IDS_EMPTY_RIGHT_FILE 16804\r
-#define IDS_CONFLICT_THEIRS_FILE 16805\r
-#define IDS_CONFLICT_MINE_FILE 16806\r
-#define IDS_LINE_STATUS_INFO_EOL 16832\r
-#define IDS_EMPTY_LINE_STATUS_INFO 16833\r
-#define IDS_LINE_STATUS_INFO 16834\r
-#define IDS_MERGEMODE_MERGING 16835\r
-#define IDS_DIFF_NUMBER_STATUS_FMT 16836\r
-#define IDS_NO_DIFF_SEL_FMT 16837\r
-#define IDS_1_DIFF_FOUND 16838\r
-#define IDS_STATUSBAR_READONLY 16839\r
-#define IDS_DIRVIEW_STATUS_FMT_FOCUS 16840\r
-#define IDS_DIRVIEW_STATUS_FMT_NOFOCUS 16841\r
-#define IDS_ERROR_INCOMPARABLE 17200\r
-#define IDS_DIRSEL_TAG 17201\r
-#define IDS_OPEN_FILESDIRS 17202\r
-#define IDS_OPEN_LEFTINVALID 17203\r
-#define IDS_OPEN_MIDDLEINVALID 17204\r
-#define IDS_OPEN_RIGHTINVALID2 17205\r
-#define IDS_OPEN_BOTHINVALID 17206\r
-#define IDS_OPEN_LEFTMIDDLEINVALID 17207\r
-#define IDS_OPEN_LEFTRIGHTINVALID 17208\r
-#define IDS_OPEN_MIDDLERIGHTINVALID 17209\r
-#define IDS_OPEN_ALLINVALID 17210\r
-#define IDS_OPEN_UNPACKERDISABLED 17211\r
-#define IDS_OPEN_MISMATCH 17212\r
-#define IDS_OPEN_RIGHTINVALID3 17213\r
-#define IDS_ERROR_FILE_NOT_FOUND 17216\r
-#define IDS_ERROR_FILE_NOT_UNPACKED 17217\r
-#define IDS_ERROR_FILEOPEN 17221\r
-#define IDS_ERROR_CONF_RESOLVE 17222\r
-#define IDS_NOT_CONFLICT_FILE 17223\r
-#define IDS_SAVE_AS_TITLE 17232\r
-#define IDS_SAVE_FMT 17233\r
-#define IDS_SAVEREADONLY_FMT 17234\r
-#define IDS_ERROR_BACKUP 17236\r
-#define IDS_BACKUP_FAILED_PROMPT 17237\r
-#define IDS_FILESAVE_FAILED 17238\r
-#define IDS_FILEPACK_FAILED_LEFT 17239\r
-#define IDS_FILEPACK_FAILED_MIDDLE 17240\r
-#define IDS_FILEPACK_FAILED_RIGHT 17241\r
-#define IDS_FILECHANGED_ONDISK 17242\r
-#define IDS_SAVEREADONLY_MULTI 17243\r
-#define IDS_FILECHANGED_RESCAN 17244\r
-#define IDS_SAVE_LEFT_AS 17245\r
-#define IDS_SAVE_MIDDLE_AS 17246\r
-#define IDS_SAVE_RIGHT_AS 17247\r
-#define IDS_FILE_DISAPPEARED 17248\r
-#define IDS_VIEWS_OUTOFSYNC 17300\r
+// COMMANDS\r
+#define ID_DIFF_OPTIONS_WHITESPACE_COMPARE 16423\r
+#define ID_DIFF_OPTIONS_WHITESPACE_IGNORE 16424\r
+#define ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL 16425\r
+#define ID_DIFF_OPTIONS_IGNORE_BLANKLINES 16426\r
+#define ID_DIFF_OPTIONS_IGNORE_CASE 16427\r
+#define ID_DIFF_OPTIONS_IGNORE_EOL 16428\r
+#define ID_DIFF_OPTIONS_IGNORE_CODEPAGE 16429\r
+#define ID_DIFF_OPTIONS_IGNORE_COMMENTS 16430\r
+#define ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS 16431\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS 16432\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_QUICK_CONTENTS 16433\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_BINARY_CONTENTS 16434\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_MODDATE 16435\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_DATESIZE 16436\r
+#define ID_DIFF_OPTIONS_COMPMETHOD_SIZE 16437\r
#define ID_DIR_COPY_LEFT_TO_RIGHT 17600\r
#define ID_DIR_COPY_LEFT_TO_MIDDLE 17601\r
#define ID_DIR_COPY_LEFT_TO_BROWSE 17602\r
#define ID_DIR_DEL_RIGHT 17616\r
#define ID_DIR_DEL_BOTH 17617\r
#define ID_DIR_DEL_ALL 17618\r
-#define IDS_COPY_RIGHT_TO_LEFT 17620\r
-#define IDS_COPY_RIGHT_TO_MIDDLE 17621\r
-#define IDS_COPY_MIDDLE_TO_LEFT 17622\r
-#define IDS_COPY_MIDDLE_TO_RIGHT 17623\r
-#define IDS_COPY_LEFT_TO_RIGHT 17624\r
-#define IDS_COPY_LEFT_TO_MIDDLE 17625\r
-#define IDS_COPY_RIGHT_TO_LEFT2 17626\r
-#define IDS_COPY_RIGHT_TO_MIDDLE2 17627\r
-#define IDS_COPY_MIDDLE_TO_LEFT2 17628\r
-#define IDS_COPY_MIDDLE_TO_RIGHT2 17629\r
-#define IDS_COPY_LEFT_TO_RIGHT2 17630\r
-#define IDS_COPY_LEFT_TO_MIDDLE2 17631\r
-#define IDS_COPY_LEFT_TO 17632\r
-#define IDS_COPY_MIDDLE_TO 17633\r
-#define IDS_COPY_RIGHT_TO 17634\r
-#define IDS_COPY_BOTH_TO 17635\r
-#define IDS_COPY_ALL_TO 17638\r
-#define IDS_COPY_DIFFERENCES_TO 17639\r
-#define IDS_COPY_LEFT_TO2 17640\r
-#define IDS_COPY_MIDDLE_TO2 17641\r
-#define IDS_COPY_RIGHT_TO2 17642\r
-#define IDS_COPY_BOTH_TO2 17643\r
-#define IDS_COPY_ALL_TO2 17645\r
-#define IDS_COPY_DIFFERENCES_TO2 17646\r
-#define IDS_DEL_LEFT_FMT 17671\r
-#define IDS_DEL_MIDDLE_FMT 17672\r
-#define IDS_DEL_RIGHT_FMT 17673\r
-#define IDS_DEL_BOTH_FMT 17674\r
-#define IDS_DEL_ALL_FMT 17675\r
-#define IDS_DEL_LEFT_FMT2 17676\r
-#define IDS_DEL_MIDDLE_FMT2 17677\r
-#define IDS_DEL_RIGHT_FMT2 17678\r
-#define IDS_DEL_BOTH_FMT2 17679\r
-#define IDS_DEL_ALL_FMT2 17680\r
-#define IDS_MOVE_LEFT_TO 17681\r
-#define IDS_MOVE_MIDDLE_TO 17682\r
-#define IDS_MOVE_RIGHT_TO 17683\r
-#define IDS_MOVE_LEFT_TO2 17684\r
-#define IDS_MOVE_MIDDLE_TO2 17685\r
-#define IDS_MOVE_RIGHT_TO2 17686\r
-#define IDS_SELECT_DEST_LEFT 17687\r
-#define IDS_SELECT_DEST_MIDDLE 17688\r
-#define IDS_SELECT_DEST_RIGHT 17689\r
-#define IDS_FILES_AFFECTED_FMT 17690\r
-#define IDS_FILES_AFFECTED_FMT2 17691\r
-#define IDS_CONFIRM_DELETE_SINGLE 17692\r
-#define IDS_CONFIRM_SINGLE_COPY 17693\r
-#define IDS_CONFIRM_MULTIPLE_COPY 17694\r
-#define IDS_DIRCMP_NOTSYNC 17695\r
-#define IDS_CONFIRM_SINGLE_MOVE 17696\r
-#define IDS_CONFIRM_MULTIPLE_MOVE 17697\r
-#define IDS_CONFIRM_COPY_CAPTION 17698\r
-#define IDS_CONFIRM_MOVE_CAPTION 17699\r
-#define IDS_CONFIRM_CLOSE_WINDOW 17700\r
#define ID_DIR_OPEN_LEFT 17701\r
#define ID_DIR_OPEN_LEFT_WITHEDITOR 17702\r
#define ID_DIR_OPEN_LEFT_WITH 17703\r
#define ID_DIR_COPY_PATHNAMES_RIGHT 17716\r
#define ID_DIR_COPY_PATHNAMES_BOTH 17717\r
#define ID_DIR_COPY_PATHNAMES_ALL 17718\r
-#define IDS_ERROR_EXECUTE_FILE 17719\r
-#define IDS_UNKNOWN_ARCHIVE_FORMAT 17731\r
-#define IDS_COLHDR_FILENAME 17751\r
-#define IDS_COLHDR_DIR 17752\r
-#define IDS_COLHDR_RESULT 17753\r
-#define IDS_COLHDR_LTIMEM 17754\r
-#define IDS_COLHDR_RTIMEM 17755\r
-#define IDS_COLHDR_MTIMEM 17756\r
-#define IDS_COLHDR_EXTENSION 17757\r
-#define IDS_COLHDR_LSIZE 17758\r
-#define IDS_COLHDR_RSIZE 17759\r
-#define IDS_COLHDR_MSIZE 17760\r
-#define IDS_COLHDR_RSIZE_SHORT 17761\r
-#define IDS_COLHDR_LSIZE_SHORT 17762\r
-#define IDS_COLHDR_MSIZE_SHORT 17763\r
-#define IDS_COLHDR_LTIMEC 17781\r
-#define IDS_COLHDR_RTIMEC 17782\r
-#define IDS_COLHDR_MTIMEC 17783\r
-#define IDS_COLHDR_NEWER 17784\r
-#define IDS_COLHDR_LVERSION 17785\r
-#define IDS_COLHDR_RVERSION 17786\r
-#define IDS_COLHDR_MVERSION 17787\r
-#define IDS_COLHDR_RESULT_ABBR 17788\r
-#define IDS_COLHDR_LATTRIBUTES 17789\r
-#define IDS_COLHDR_RATTRIBUTES 17790\r
-#define IDS_COLHDR_MATTRIBUTES 17791\r
-#define IDS_COLHDR_LEOL_TYPE 17792\r
-#define IDS_COLHDR_MEOL_TYPE 17793\r
-#define IDS_COLHDR_REOL_TYPE 17794\r
-#define IDS_COLHDR_LENCODING 17811\r
-#define IDS_COLHDR_RENCODING 17812\r
-#define IDS_COLHDR_MENCODING 17813\r
-#define IDS_COLHDR_NIDIFFS 17814\r
-#define IDS_COLHDR_NSDIFFS 17815\r
-#define IDS_COLHDR_BINARY 17816\r
-#define IDS_CANT_COMPARE_FILES 17831\r
-#define IDS_ABORTED_ITEM 17832\r
-#define IDS_FILE_SKIPPED 17833\r
-#define IDS_DIR_SKIPPED 17834\r
-#define IDS_LEFT_ONLY_IN_FMT 17835\r
-#define IDS_MIDDLE_ONLY_IN_FMT 17836\r
-#define IDS_RIGHT_ONLY_IN_FMT 17837\r
-#define IDS_DOES_NOT_EXIST_IN_FMT 17838\r
-#define IDS_BIN_FILES_SAME 17839\r
-#define IDS_IDENTICAL 17840\r
-#define IDS_BIN_FILES_DIFF 17841\r
-#define IDS_FILES_ARE_DIFFERENT 17842\r
-#define IDS_FOLDERS_ARE_DIFFERENT 17843\r
-#define IDS_LEFTONLY 17844\r
-#define IDS_RIGHTONLY 17845\r
-#define IDS_MIDDLEONLY 17846\r
-#define IDS_NOITEMLEFT 17847\r
-#define IDS_NOITEMRIGHT 17848\r
-#define IDS_NOITEMMIDDLE 17849\r
-#define IDS_DIFFERENT 17850\r
-#define IDS_CMPRES_ERROR 17851\r
-#define IDS_TEXT_FILES_SAME 17852\r
-#define IDS_TEXT_FILES_DIFF 17861\r
-#define IDS_LEFTONLY_DIFF 17862\r
-#define IDS_MIDDLEONLY_DIFF 17863\r
-#define IDS_RIGHTONLY_DIFF 17864\r
-#define IDS_ELAPSED_TIME 17881\r
-#define IDS_STATUS_SELITEM1 17882\r
-#define IDS_STATUS_SELITEMS 17883\r
-#define IDS_COLDESC_FILENAME 17901\r
-#define IDS_COLDESC_DIR 17902\r
-#define IDS_COLDESC_RESULT 17903\r
-#define IDS_COLDESC_LTIMEM 17904\r
-#define IDS_COLDESC_RTIMEM 17905\r
-#define IDS_COLDESC_MTIMEM 17906\r
-#define IDS_COLDESC_EXTENSION 17907\r
-#define IDS_COLDESC_LSIZE 17908\r
-#define IDS_COLDESC_RSIZE 17909\r
-#define IDS_COLDESC_MSIZE 17910\r
-#define IDS_COLDESC_LSIZE_SHORT 17911\r
-#define IDS_COLDESC_RSIZE_SHORT 17912\r
-#define IDS_COLDESC_MSIZE_SHORT 17913\r
-#define IDS_COLDESC_LTIMEC 17914\r
-#define IDS_COLDESC_RTIMEC 17915\r
-#define IDS_COLDESC_MTIMEC 17916\r
-#define IDS_COLDESC_NEWER 17917\r
-#define IDS_COLDESC_LVERSION 17918\r
-#define IDS_COLDESC_RVERSION 17919\r
-#define IDS_COLDESC_MVERSION 17920\r
-#define IDS_COLDESC_RESULT_ABBR 17921\r
-#define IDS_COLDESC_LATTRIBUTES 17922\r
-#define IDS_COLDESC_RATTRIBUTES 17923\r
-#define IDS_COLDESC_MATTRIBUTES 17924\r
-#define IDS_COLDESC_LEOL_TYPE 17925\r
-#define IDS_COLDESC_REOL_TYPE 17926\r
-#define IDS_COLDESC_MEOL_TYPE 17927\r
-#define IDS_COLDESC_LENCODING 17941\r
-#define IDS_COLDESC_RENCODING 17942\r
-#define IDS_COLDESC_MENCODING 17943\r
-#define IDS_COLDESC_NIDIFFS 17944\r
-#define IDS_COLDESC_NSDIFFS 17945\r
-#define IDS_COLDESC_BINARY 17946\r
-#define IDS_DIRECTORY_REPORT_TITLE 17962\r
-#define IDS_REPORT_COMMALIST 17963\r
-#define IDS_REPORT_TABLIST 17964\r
-#define IDS_REPORT_SIMPLEHTML 17965\r
-#define IDS_REPORT_SIMPLEXML 17966\r
-#define IDS_REPORT_FILEOVERWRITE 17967\r
-#define IDS_REPORT_ERROR 17968\r
-#define IDS_REPORT_SUCCESS 17969\r
-#define IDS_FILE_TO_ITSELF 18100\r
-#define IDS_FILESSAME 18101\r
-#define IDS_FILEERROR 18103\r
-#define IDS_TEMP_FILEERROR 18105\r
-#define IDS_SUGGEST_IGNOREEOL 18107\r
-#define IDS_INVALID_DIRECTORY 18108\r
-#define IDS_CANNOT_OPEN_BINARYFILE 18109\r
-#define IDS_CREATE_PAIR_FOLDER 18110\r
-#define IDS_MOVE_TO_NEXTFILE 18111\r
-#define IDS_MOVE_TO_PREVFILE 18112\r
-#define IDS_MOVE_TO_NEXTPAGE 18113\r
-#define IDS_MOVE_TO_PREVPAGE 18114\r
-#define IDS_SUGGEST_IGNORECODEPAGE 18131\r
-#define IDS_LOSSY_TRANSCODING_FIRST 18132\r
-#define IDS_LOSSY_TRANSCODING_SECOND 18133\r
-#define IDS_LOSSY_TRANSCODING_THIRD 18134\r
-#define IDS_LOSSY_TRANSCODING_BOTH 18135\r
-#define IDS_LINEDIFF_NODIFF 18151\r
-#define IDS_LINEDIFF_NODIFF_CAPTION 18152\r
-#define IDS_NUM_REPLACED 18161\r
-#define IDS_EDIT_TEXT_NOT_FOUND 18162\r
-#define IDS_MERGE_MODE 18181\r
#define ID_EDITOR_COPY_PATH 18182\r
#define ID_EDITOR_COPY_FILENAME 18183\r
#define ID_EDITOR_COPY 18184\r
-#define IDS_LOCBAR_CAPTION 18201\r
-#define IDS_DIFFBAR_CAPTION 18202\r
-#define IDS_DIFF_SUCCEEDED 18400\r
-#define IDS_DIFF_ITEM1NOTFOUND 18401\r
-#define IDS_DIFF_ITEM2NOTFOUND 18402\r
-#define IDS_DIFF_FILEOVERWRITE 18403\r
-#define IDS_DIFF_SELECTEDFILES 18404\r
-#define IDS_DIFF_NORMAL 18405\r
-#define IDS_DIFF_CONTEXT 18406\r
-#define IDS_DIFF_UNIFIED 18407\r
-#define IDS_DIFF_HTML 18408\r
-#define IDS_FILEWRITE_ERROR 18409\r
-#define IDS_PATH_NOT_ABSOLUTE 18410\r
-#define IDS_MUST_SPECIFY_OUTPUT 18411\r
-#define IDS_CANNOT_CREATE_BINARYPATCH 18412\r
-#define IDS_CANNOT_CREATE_DIRPATCH 18413\r
-#define IDS_SAVEFILES_FORPATCH 18414\r
-#define IDS_FOLDER_NOTEXIST 18415\r
-#define IDS_NO_ZIP_SUPPORT 18449\r
-#define IDS_OPT_EXPORT_CAPTION 18452\r
-#define IDS_OPT_IMPORT_CAPTION 18453\r
-#define IDS_OPT_IMPORT_DONE 18454\r
-#define IDS_OPT_EXPORT_DONE 18455\r
-#define IDS_OPT_IMPORT_ERR 18456\r
-#define IDS_OPT_EXPORT_ERR 18457\r
-#define IDS_CLOSEALL_WINDOWS 18458\r
-#define IDS_BREAK_ON_WHITESPACE 18491\r
-#define IDS_BREAK_ON_PUNCTUATION 18492\r
-#define IDS_UNK_ERROR_READING_PROJECT 18510\r
-#define IDS_UNK_ERROR_SAVING_PROJECT 18511\r
-#define IDS_PROJFILE_LOAD_SUCCESS 18513\r
-#define IDS_PROJFILE_SAVE_SUCCESS 18514\r
-#define IDS_TEXT_REPORT_FILES 18540\r
-#define IDS_HTML_REPORT_FILES 18541\r
-#define IDS_XML_REPORT_FILES 18542\r
-#define ID_EDIT_MARK 21406 // editcmd.h\r
-#define IDS_EOL_DOS 30400\r
-#define IDS_EOL_MAC 30401\r
-#define IDS_EOL_UNIX 30402\r
-#define IDS_EOL_MIXED 30403\r
-#define IDS_EOL_BIN 30404\r
-#define IDS_EOL_LF 30405\r
-#define IDS_EOL_CR 30406\r
-#define IDS_EOL_CRLF 30407\r
-#define IDS_EOL_NONE 30408\r
-#define IDS_PLUGINSLIST_NAME 30432\r
-#define IDS_PLUGINSLIST_TYPE 30433\r
-#define IDS_PLUGINSLIST_DESC 30434\r
-#define IDS_PLUGINS_TYPE_UNPACKER 30435\r
-#define IDS_PLUGINS_TYPE_PREDIFFER 30436\r
-#define IDS_PLUGINS_TYPE_EDITSCRIPT 30437\r
#define ID_FILE_NEW3 32767\r
#define ID_FILE_SAVE_LEFT 32768\r
#define ID_FILE_SAVE_MIDDLE 32769\r
#define ID_REFRESH 32787\r
#define ID_EDIT_COPY_LINENUMBERS 32788\r
#define ID_RESCAN 32789\r
-#define ID_EDIT_FIND_PREVIOUS 32799\r
+#define ID_GOTO_MOVED_LINE_LM 32790\r
+#define ID_GOTO_MOVED_LINE_MR 32791\r
#define ID_OPTIONS_SHOWIDENTICAL 32800\r
#define ID_OPTIONS_SHOWDIFFERENT 32801\r
#define ID_OPTIONS_SHOWUNIQUELEFT 32802\r
#define ID_OPTIONS_SHOWMISSINGLEFTONLY 32810\r
#define ID_OPTIONS_SHOWMISSINGMIDDLEONLY 32811\r
#define ID_OPTIONS_SHOWMISSINGRIGHTONLY 32812\r
+#define ID_VIEW_EOL 32815\r
#define ID_VIEW_SELECTFONT 32816\r
#define ID_VIEW_USEDEFAULTFONT 32817\r
#define ID_VIEW_WHITESPACE 32818\r
#define ID_VIEW_LOCATION_BAR 32820\r
#define ID_VIEW_DIR_STATISTICS 32821\r
#define ID_VIEW_LINEDIFFS 32823\r
-#define ID_VIEW_WORDWRAP 32824\r
#define ID_VIEW_LINENUMBERS 32825\r
#define ID_VIEW_TAB_BAR 32826\r
#define ID_VIEW_TREEMODE 32827\r
#define ID_TOOLS_GENERATEREPORT 32868\r
#define ID_MERGE_COMPARE 32869\r
#define ID_MERGE_COMPARE_TEXT 32870\r
-#define ID_MERGE_COMPARE_XML 32871\r
+#define ID_MERGE_COMPARE_TABLE 32871\r
#define ID_MERGE_COMPARE_HEX 32872\r
#define ID_MERGE_COMPARE_IMAGE 32873\r
-#define ID_MERGE_COMPARE_LEFT1_LEFT2 32874\r
-#define ID_MERGE_COMPARE_RIGHT1_RIGHT2 32875\r
-#define ID_MERGE_COMPARE_LEFT1_RIGHT2 32876\r
-#define ID_MERGE_COMPARE_LEFT2_RIGHT1 32877\r
+#define ID_MERGE_COMPARE_LEFT1_LEFT2 32875\r
+#define ID_MERGE_COMPARE_RIGHT1_RIGHT2 32876\r
+#define ID_MERGE_COMPARE_LEFT1_RIGHT2 32877\r
+#define ID_MERGE_COMPARE_LEFT2_RIGHT1 32878\r
#define ID_UNPACK_MANUAL 32880\r
#define ID_UNPACK_AUTO 32881\r
-#define ID_POPUP_OPEN_WITH_UNPACKER 32882\r
+#define ID_OPEN_WITH_UNPACKER 32882\r
#define ID_NO_PREDIFFER 32883\r
#define ID_SUGGESTED_PLUGINS 32884\r
#define ID_NOT_SUGGESTED_PLUGINS 32885\r
#define ID_RELOAD_PLUGINS 32886\r
+#define ID_NO_UNPACKER 32887\r
+#define ID_APPLY_PREDIFFER 32888\r
#define ID_WINDOW_CHANGE_PANE 32896\r
#define ID_WINDOW_CLOSEALL 32897\r
+#define ID_SELECT_PREDIFFER 32898\r
+#define ID_SELECT_UNPACKER 32899\r
#define ID_HELP_CONTENTS 32912\r
#define ID_HELP_GETCONFIG 32913\r
#define ID_HELP_GNULICENSE 32914\r
-#define ID_HELP_SEARCH 32916\r
-#define ID_PREDIFF_MANUAL 32929\r
-#define ID_PREDIFF_AUTO 32930\r
+#define ID_PREDIFFER_SETTINGS_NONE 32920\r
+#define ID_PREDIFFER_SETTINGS_AUTO 32921\r
+#define ID_PREDIFFER_SETTINGS_SELECT 32922\r
+#define ID_UNPACKER_SETTINGS_NONE 32923\r
+#define ID_UNPACKER_SETTINGS_AUTO 32924\r
+#define ID_UNPACKER_SETTINGS_SELECT 32925\r
#define ID_NO_EDIT_SCRIPTS 32931\r
#define ID_NO_SCT_SCRIPTS 32932\r
#define ID_FILE_OPEN_REGISTERED 32944\r
#define ID_FILE_OPEN_WITHEDITOR 32945\r
#define ID_FILE_OPEN_WITH 32946\r
+#define ID_FILE_OPEN_PARENT_FOLDER 32947\r
#define ID_STATUS_MERGINGMODE 32960\r
#define ID_STATUS_DIFFNUM 32961\r
#define ID_STATUS_RIGHTDIR_RO 32962\r
#define ID_DIR_SHELL_CONTEXT_MENU_LEFT 33002\r
#define ID_DIR_SHELL_CONTEXT_MENU_MIDDLE 33003\r
#define ID_DIR_SHELL_CONTEXT_MENU_RIGHT 33004\r
-#define ID_SCRIPT_FIRST 33012\r
-#define ID_SCRIPT_LAST 33059\r
-#define ID_PREDIFFERS_FIRST 33060\r
-#define ID_PREDIFFERS_LAST 33107\r
+#define ID_SCRIPT_FIRST 33010\r
+#define ID_SCRIPT_LAST 33039\r
+#define ID_PREDIFFERS_FIRST 33040\r
+#define ID_PREDIFFERS_LAST 33069\r
+#define ID_UNPACKERS_FIRST 33070\r
+#define ID_UNPACKERS_LAST 33110\r
#define ID_DISPLAY_MOVED_NONE 33111\r
#define ID_DISPLAY_MOVED_ALL 33112\r
-#define ID_DISPLAY_MOVED_FOLLOW_DIFF 33113\r
#define ID_LOCBAR_GOTODIFF 33114\r
-#define IDS_LOCBAR_GOTOLINE_FMT 33115\r
#define ID_FILE_OPENPROJECT 33116\r
#define ID_VIEW_SHOWHIDDENITEMS 33117\r
-#define ID_VIEW_SWAPPANES 33118\r
#define ID_FILE_SAVEPROJECT 33119\r
#define ID_FILE_ENCODING 33120\r
#define ID_FILE_OPENCONFLICT 33121\r
#define ID_LOAD_PROJECT 33122\r
#define ID_SAVE_PROJECT 33123\r
-#define IDS_AUTOCOMPLETE_DISABLED 33142\r
-#define IDS_AUTOCOMPLETE_FILE_SYS 33143\r
-#define IDS_AUTOCOMPLETE_MRU 33144\r
#define ID_EDIT_TOGGLE_BOOKMARK 33145\r
#define ID_EDIT_GOTO_NEXT_BOOKMARK 33146\r
#define ID_EDIT_GOTO_PREV_BOOKMARK 33147\r
#define ID_EDIT_CLEAR_ALL_BOOKMARKS 33148\r
-#define ID_VIEW_FILEMARGIN 33150\r
#define ID_VIEW_CHANGESCHEME 33151\r
#define ID_COLORSCHEME_FIRST 33152\r
#define IDS_COLORSCHEME_PLAIN 33152 // = ID_COLORSCHEME_FIRST\r
#define IDS_COLORSCHEME_ASP 33153\r
-#define IDS_COLORSCHEME_BASIC 33154\r
-#define IDS_COLORSCHEME_BATCH 33155\r
-#define IDS_COLORSCHEME_C 33156\r
-#define IDS_COLORSCHEME_CSHARP 33157\r
-#define IDS_COLORSCHEME_CSS 33158\r
-#define IDS_COLORSCHEME_DCL 33159\r
-#define IDS_COLORSCHEME_FORTRAN 33160\r
-#define IDS_COLORSCHEME_GO 33161\r
-#define IDS_COLORSCHEME_HTML 33162\r
-#define IDS_COLORSCHEME_INI 33163\r
-#define IDS_COLORSCHEME_INNOSETUP 33164\r
-#define IDS_COLORSCHEME_INSTALLSHIELD 33165\r
-#define IDS_COLORSCHEME_JAVA 33166\r
-#define IDS_COLORSCHEME_LISP 33167\r
-#define IDS_COLORSCHEME_LUA 33168\r
-#define IDS_COLORSCHEME_NSIS 33169\r
-#define IDS_COLORSCHEME_PASCAL 33170\r
-#define IDS_COLORSCHEME_PERL 33171\r
-#define IDS_COLORSCHEME_PHP 33172\r
-#define IDS_COLORSCHEME_PO 33173\r
-#define IDS_COLORSCHEME_POWERSHELL 33174\r
-#define IDS_COLORSCHEME_PYTHON 33175\r
-#define IDS_COLORSCHEME_REXX 33176\r
-#define IDS_COLORSCHEME_RSRC 33177\r
-#define IDS_COLORSCHEME_RUBY 33178\r
-#define IDS_COLORSCHEME_RUST 33179\r
-#define IDS_COLORSCHEME_SGML 33180\r
-#define IDS_COLORSCHEME_SH 33181\r
-#define IDS_COLORSCHEME_SIOD 33182\r
-#define IDS_COLORSCHEME_SQL 33183\r
-#define IDS_COLORSCHEME_TCL 33184\r
-#define IDS_COLORSCHEME_TEX 33185\r
-#define IDS_COLORSCHEME_VERILOG 33186\r
-#define IDS_COLORSCHEME_VHDL 33187\r
-#define IDS_COLORSCHEME_XML 33188\r
-#define ID_COLORSCHEME_LAST 33188 // = IDS_COLORSCHEME_XML\r
+#define IDS_COLORSCHEME_AUTOIT 33154\r
+#define IDS_COLORSCHEME_BASIC 33155\r
+#define IDS_COLORSCHEME_BATCH 33156\r
+#define IDS_COLORSCHEME_C 33157\r
+#define IDS_COLORSCHEME_CSHARP 33158\r
+#define IDS_COLORSCHEME_CSS 33159\r
+#define IDS_COLORSCHEME_DCL 33160\r
+#define IDS_COLORSCHEME_FORTRAN 33161\r
+#define IDS_COLORSCHEME_GO 33162\r
+#define IDS_COLORSCHEME_HTML 33163\r
+#define IDS_COLORSCHEME_INI 33164\r
+#define IDS_COLORSCHEME_INNOSETUP 33165\r
+#define IDS_COLORSCHEME_INSTALLSHIELD 33166\r
+#define IDS_COLORSCHEME_JAVA 33167\r
+#define IDS_COLORSCHEME_JAVASCRIPT 33168\r
+#define IDS_COLORSCHEME_JSON 33169\r
+#define IDS_COLORSCHEME_LISP 33170\r
+#define IDS_COLORSCHEME_LUA 33171\r
+#define IDS_COLORSCHEME_NSIS 33172\r
+#define IDS_COLORSCHEME_PASCAL 33173\r
+#define IDS_COLORSCHEME_PERL 33174\r
+#define IDS_COLORSCHEME_PHP 33175\r
+#define IDS_COLORSCHEME_PO 33176\r
+#define IDS_COLORSCHEME_POWERSHELL 33177\r
+#define IDS_COLORSCHEME_PYTHON 33178\r
+#define IDS_COLORSCHEME_REXX 33179\r
+#define IDS_COLORSCHEME_RSRC 33180\r
+#define IDS_COLORSCHEME_RUBY 33181\r
+#define IDS_COLORSCHEME_RUST 33182\r
+#define IDS_COLORSCHEME_SGML 33183\r
+#define IDS_COLORSCHEME_SH 33184\r
+#define IDS_COLORSCHEME_SIOD 33185\r
+#define IDS_COLORSCHEME_SMARTY 33186\r
+#define IDS_COLORSCHEME_SQL 33187\r
+#define IDS_COLORSCHEME_TCL 33188\r
+#define IDS_COLORSCHEME_TEX 33189\r
+#define IDS_COLORSCHEME_VERILOG 33190\r
+#define IDS_COLORSCHEME_VHDL 33191\r
+#define IDS_COLORSCHEME_XML 33192\r
+#define ID_COLORSCHEME_LAST 33192 // = IDS_COLORSCHEME_XML\r
#define ID_TOOLBAR_NONE 33194\r
#define ID_TOOLBAR_SMALL 33195\r
#define ID_TOOLBAR_BIG 33196\r
#define ID_PLUGINS_LIST 33203\r
#define ID_PREDIFFER_MANUAL 33204\r
#define ID_PREDIFFER_AUTO 33205\r
-#define ID_VIEW_EXPAND 33206\r
-#define ID_VIEW_COLLAPSE 33207\r
#define ID_VIEW_DIFFCONTEXT_ALL 33208\r
#define ID_VIEW_DIFFCONTEXT_0 33209\r
#define ID_VIEW_DIFFCONTEXT_1 33210\r
#define ID_VIEW_DIFFCONTEXT_7 33223\r
#define ID_VIEW_DIFFCONTEXT_9 33224\r
#define ID_VIEW_DIFFCONTEXT_TOGGLE 33225\r
-#define ID_EDIT_LOWERCASE 33226\r
-#define ID_EDIT_UPPERCASE 33227\r
+#define ID_VIEW_DIFFCONTEXT_INVERT 33226\r
#define ID_VIEW_SPLITVERTICALLY 33228\r
-#define IDS_FRHED_NOTINSTALLED 33229\r
#define ID_ADD_SYNCPOINT 33230\r
#define ID_CLEAR_SYNCPOINTS 33231\r
#define ID_CLOSE_OTHER_TABS 33232\r
#define ID_CLOSE_RIGHT_TABS 33233\r
#define ID_CLOSE_LEFT_TABS 33234\r
-#define IDS_AUTO_MERGE 33241\r
#define ID_COPY_FROM_LEFT 33242\r
#define ID_COPY_FROM_RIGHT 33243\r
-#define IDS_CODEPAGE_MERGED 33244\r
-#define IDS_CODEPAGE_CONFLICT 33245\r
-#define IDS_EOL_MERGED 33246\r
-#define IDS_EOL_CONFLICT 33247\r
#define ID_NO_MRU 33248\r
#define ID_MRU_FIRST 33249\r
#define ID_MRU_LAST 33350\r
#define ID_TABBAR_AUTO_MAXWIDTH 33351\r
-#define IDS_IMAGE_MENU 33352\r
#define ID_IMG_VIEWDIFFERENCES 33353\r
#define ID_IMG_ZOOM_25 33354\r
#define ID_IMG_ZOOM_50 33355\r
#define ID_IMG_DRAGGINGMODE_NONE 33385\r
#define ID_IMG_DRAGGINGMODE_MOVE 33386\r
#define ID_IMG_DRAGGINGMODE_ADJUST_OFFSET 33387\r
-#define IDC_COMPAREIMAGE_PATTERNS 33388\r
-#define IDC_COMPAREIMAGE_DEFAULTS 33389\r
-#define IDC_PLUGIN_SETTINGS 33390\r
-#define IDC_COMPAREBINARY_PATTERNS 33391\r
-#define IDC_COMPAREBINARY_VIEWSETTINGS 33392\r
-#define IDC_COMPAREBINARY_BINARYMODE 33394\r
-#define IDC_COMPAREBINARY_CHARACTERSET 33395\r
-#define IDC_COMPAREBINARY_DEFAULTS 33398\r
-#define ID_HELP_RELEASENOTES 33399\r
-#define ID_HELP_TRANSLATIONS 33400\r
-#define IDS_COMPMETHOD_FULL_CONTENTS 33401\r
-#define IDS_COMPMETHOD_QUICK_CONTENTS 33402\r
-#define IDS_COMPMETHOD_BINARY_CONTENTS 33403\r
-#define IDS_COMPMETHOD_MODDATE 33494\r
-#define IDS_COMPMETHOD_DATESIZE 33495\r
-#define IDS_COMPMETHOD_SIZE 33496\r
-#define IDS_UNPACK_AUTO 33497\r
-#define IDS_NO_PREDIFFER 33501\r
-#define IDS_SUGGESTED_PLUGINS 33502\r
-#define IDS_NOT_SUGGESTED_PLUGINS 33503\r
-#define IDS_PRIVATEBUILD_FMT 33504\r
-#define IDS_CHECKFORUPDATES_UPTODATE 33521\r
-#define IDS_CHECKFORUPDATES_NEWVERSION 33522\r
-#define IDS_CHECKFORUPDATES_FAILED 33523\r
-#define IDS_TITLE_PLUGINS_SETTINGS 33524\r
-#define IDS_NO_EDIT_SCRIPTS 33525\r
-#define IDS_NO_SCT_SCRIPTS 33541\r
-#define IDS_USERCHOICE_NONE 33542\r
-#define IDS_USERCHOICE_AUTOMATIC 33543\r
-#define IDS_CLOSE_LEFT_TABS 33544\r
-#define IDS_CLOSE_RIGHT_TABS 33545\r
-#define IDS_CLOSE_OTHER_TABS 33644\r
-#define IDS_TABBAR_AUTO_MAXWIDTH 33645\r
+#define ID_IMG_DRAGGINGMODE_VERTICAL_WIPE 33388\r
+#define ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE 33389\r
+#define ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT 33390\r
+#define ID_HELP_RELEASENOTES 33401\r
+#define ID_HELP_TRANSLATIONS 33402\r
+#define ID_HELP_CHECKFORUPDATES 33403\r
#define ID_FILE_PROJECT_MRU_FIRST 33646\r
#define ID_FILE_PROJECT_MRU_LAST 33656\r
-#define IDS_CREATE_FOLDER 33657\r
-#define IDS_CREATE_FOLDER_ERROR 33658\r
#define ID_FILE_SHELLMENU 33659\r
+#define ID_MERGE_COMPARE_NONHORIZONTALLY 33660\r
+#define ID_ACCEL_QUIT 33661\r
+#define ID_IMG_VECTORIMAGESCALING_25 33719\r
+#define ID_IMG_VECTORIMAGESCALING_50 33720\r
+#define ID_IMG_VECTORIMAGESCALING_100 33721\r
+#define ID_IMG_VECTORIMAGESCALING_200 33722\r
+#define ID_IMG_VECTORIMAGESCALING_400 33723\r
+#define ID_IMG_VECTORIMAGESCALING_800 33724\r
+#define ID_IMG_COMPARE_EXTRACTED_TEXT 33725\r
+#define ID_FILE_NEW_TABLE 34164\r
+#define ID_FILE_NEW_HEX 34165\r
+#define ID_FILE_NEW_IMAGE 34166\r
+#define ID_FILE_NEW3_TABLE 34167\r
+#define ID_FILE_NEW3_HEX 34168\r
+#define ID_FILE_NEW3_IMAGE 34169\r
+#define ID_SWAPPANES_SWAP12 34170\r
+#define ID_SWAPPANES_SWAP23 34171\r
+#define ID_SWAPPANES_SWAP13 34172\r
+#define ID_ADD_TO_IGNORED_SUBSTITUTIONS 34173\r
+#define ID_FIRSTFILE 34182\r
+#define ID_PREVFILE 34183\r
+#define ID_NEXTFILE 34184\r
+#define ID_LASTFILE 34185\r
+#define ID_LINES_R2L 34190\r
+#define ID_LINES_L2R 34191\r
+#define ID_COPY_LINES_FROM_LEFT 34192\r
+#define ID_COPY_LINES_FROM_RIGHT 34193\r
+// String resources\r
+#define IDS_SPLASH_GPLTEXT 38977\r
+#define IDS_MESSAGEBOX_OK 39001\r
+#define IDS_MESSAGEBOX_CANCEL 39002\r
+#define IDS_MESSAGEBOX_ABORT 39003\r
+#define IDS_MESSAGEBOX_RETRY 39004\r
+#define IDS_MESSAGEBOX_IGNORE 39005\r
+#define IDS_MESSAGEBOX_IGNOREALL 39006\r
+#define IDS_MESSAGEBOX_YES 39007\r
+#define IDS_MESSAGEBOX_YES_TO_ALL 39008\r
+#define IDS_MESSAGEBOX_NO 39009\r
+#define IDS_MESSAGEBOX_NO_TO_ALL 39010\r
+#define IDS_MESSAGEBOX_CONTINUE 39011\r
+#define IDS_MESSAGEBOX_SKIP 39012\r
+#define IDS_MESSAGEBOX_SKIPALL 39013\r
+#define IDS_MESSAGEBOX_HELP 39014\r
+#define IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN 39015\r
+#define IDS_MESSAGEBOX_DONT_ASK_AGAIN 39016\r
+#define IDS_MESSAGEBOX_CHECKBOX_TOOLTIP 39017\r
+#define IDS_OPTIONSPG_GENERAL 39041\r
+#define IDS_OPTIONSPG_COMPARE 39042\r
+#define IDS_OPTIONSPG_EDITOR 39043\r
+#define IDS_OPTIONSPG_COLORS 39044\r
+#define IDS_OPTIONSPG_TEXTCOLORS 39045\r
+#define IDS_OPTIONSPG_SYNTAXCOLORS 39046\r
+#define IDS_OPTIONSPG_MARKERCOLORS 39047\r
+#define IDS_OPTIONSPG_SYSTEM 39048\r
+#define IDS_OPTIONSPG_CODEPAGE 39050\r
+#define IDS_OPTIONSPG_ARCHIVE 39051\r
+#define IDS_OPTIONSPG_BACKUPS 39052\r
+#define IDS_OPTIONSPG_SHELL 39053\r
+#define IDS_OPTIONSPG_MERGECOLORS 39054\r
+#define IDS_OPTIONSPG_GENCOMPARE 39055\r
+#define IDS_OPTIONSPG_FOLDERCOMPARE 39056\r
+#define IDS_OPTIONSPG_IMAGECOMPARE 39057\r
+#define IDS_OPTIONSPG_BINARYCOMPARE 39058\r
+#define IDS_OPTIONSPG_DIRCOLORS 39059\r
+#define IDS_OPTIONSPG_COLOR_SCHEMES 39060\r
+#define IDS_OPTIONSPG_TABLECOMPARE 39061\r
+#define IDS_OPTIONSPG_GENEDITOR 39062\r
+#define IDS_OPTIONSPG_EDITOR_SYNTAX 39063\r
+#define IDS_TO 40000\r
+#define IDS_FROM_LEFT 40001\r
+#define IDS_TO_LEFT 40002\r
+#define IDS_FROM_RIGHT 40003\r
+#define IDS_TO_RIGHT 40004\r
+#define IDS_FROM_MIDDLE 40005\r
+#define IDS_TO_MIDDLE 40006\r
+#define IDS_VERSION_FMT 40385\r
+#define IDS_WINX64 40388\r
+#define IDS_OPTIONS_TITLE 40400\r
+#define IDS_MESSAGE_BOX_ARE_RESET 40401\r
+#define IDS_OPTIONS_INVALID_TABSIZE 40404\r
+#define IDS_OPEN_TITLE 40416\r
+#define IDS_PROGRAMFILES 40417\r
+#define IDS_ALLFILES 40418\r
+#define IDS_PROJECTFILES 40419\r
+#define IDS_PROJECTFILES_EXT 40420\r
+#define IDS_INIFILES 40421\r
+#define IDS_FILTERFILE_NAMETITLE 40448\r
+#define IDS_FILTERFILE_PATHTITLE 40449\r
+#define IDS_FILTER_TITLE 40450\r
+#define IDS_FILTER_PREFIX 40451\r
+#define IDS_FILTERFILE_DESCTITLE 40452\r
+#define IDS_FILEFILTER_SAVENEW 40453\r
+#define IDS_FILEFILTER_FILEMASK 40454\r
+#define IDS_FILEFILTER_TMPL_MISSING 40455\r
+#define IDS_FILEFILTER_TMPL_COPY 40456\r
+#define IDS_FILEFILTER_NO_USERFOLDER 40457\r
+#define IDS_FILEFILTER_DELETE_FAIL 40458\r
+#define IDS_FILEFILTER_INSTALL 40459\r
+#define IDS_FILEFILTER_INSTALLFAIL 40460\r
+#define IDS_FILEFILTER_OVERWRITE 40461\r
+#define IDS_FILTERLINE_REGEXP 40480\r
+#define IDS_FILTERCHANGED 40496\r
+#define IDS_DIRECTORY_WINDOW_TITLE 40800\r
+#define IDS_FILE_COMPARISON_TITLE 40801\r
+#define IDS_EMPTY_LEFT_FILE 40802\r
+#define IDS_EMPTY_MIDDLE_FILE 40803\r
+#define IDS_EMPTY_RIGHT_FILE 40804\r
+#define IDS_CONFLICT_BASE_FILE 40805\r
+#define IDS_CONFLICT_THEIRS_FILE 40806\r
+#define IDS_CONFLICT_MINE_FILE 40807\r
+#define IDS_SELFCOMPARE_ORIGINAL_FILE 40808\r
+#define IDS_LINE_STATUS_INFO_SEL 40831\r
+#define IDS_LINE_STATUS_INFO_EOL 40832\r
+#define IDS_EMPTY_LINE_STATUS_INFO 40833\r
+#define IDS_LINE_STATUS_INFO 40834\r
+#define IDS_MERGEMODE_MERGING 40835\r
+#define IDS_DIFF_NUMBER_STATUS_FMT 40836\r
+#define IDS_NO_DIFF_SEL_FMT 40837\r
+#define IDS_1_DIFF_FOUND 40838\r
+#define IDS_STATUSBAR_READONLY 40839\r
+#define IDS_DIRVIEW_STATUS_FMT_FOCUS 40840\r
+#define IDS_DIRVIEW_STATUS_FMT_NOFOCUS 40841\r
+#define IDS_ERROR_INCOMPARABLE 41200\r
+#define IDS_DIRSEL_TAG 41201\r
+#define IDS_OPEN_FILESDIRS 41202\r
+#define IDS_OPEN_LEFTINVALID 41203\r
+#define IDS_OPEN_MIDDLEINVALID 41204\r
+#define IDS_OPEN_RIGHTINVALID2 41205\r
+#define IDS_OPEN_BOTHINVALID 41206\r
+#define IDS_OPEN_LEFTMIDDLEINVALID 41207\r
+#define IDS_OPEN_LEFTRIGHTINVALID 41208\r
+#define IDS_OPEN_MIDDLERIGHTINVALID 41209\r
+#define IDS_OPEN_ALLINVALID 41210\r
+#define IDS_OPEN_UNPACKERDISABLED 41211\r
+#define IDS_OPEN_MISMATCH 41212\r
+#define IDS_OPEN_RIGHTINVALID3 41213\r
+#define IDS_ERROR_FILE_NOT_FOUND 41216\r
+#define IDS_ERROR_FILE_NOT_UNPACKED 41217\r
+#define IDS_ERROR_FILEOPEN 41221\r
+#define IDS_ERROR_CONF_RESOLVE 41222\r
+#define IDS_NOT_CONFLICT_FILE 41223\r
+#define IDS_SAVE_AS_TITLE 41232\r
+#define IDS_SAVE_FMT 41233\r
+#define IDS_SAVEREADONLY_FMT 41234\r
+#define IDS_ERROR_BACKUP 41236\r
+#define IDS_BACKUP_FAILED_PROMPT 41237\r
+#define IDS_FILESAVE_FAILED 41238\r
+#define IDS_FILEPACK_FAILED_LEFT 41239\r
+#define IDS_FILEPACK_FAILED_MIDDLE 41240\r
+#define IDS_FILEPACK_FAILED_RIGHT 41241\r
+#define IDS_FILECHANGED_ONDISK 41242\r
+#define IDS_SAVEREADONLY_MULTI 41243\r
+#define IDS_FILECHANGED_RESCAN 41244\r
+#define IDS_SAVE_LEFT_AS 41245\r
+#define IDS_SAVE_MIDDLE_AS 41246\r
+#define IDS_SAVE_RIGHT_AS 41247\r
+#define IDS_FILE_DISAPPEARED 41248\r
+#define IDS_VIEWS_OUTOFSYNC 41300\r
+#define IDS_COPY_RIGHT_TO_LEFT 41620\r
+#define IDS_COPY_RIGHT_TO_MIDDLE 41621\r
+#define IDS_COPY_MIDDLE_TO_LEFT 41622\r
+#define IDS_COPY_MIDDLE_TO_RIGHT 41623\r
+#define IDS_COPY_LEFT_TO_RIGHT 41624\r
+#define IDS_COPY_LEFT_TO_MIDDLE 41625\r
+#define IDS_COPY_RIGHT_TO_LEFT2 41626\r
+#define IDS_COPY_RIGHT_TO_MIDDLE2 41627\r
+#define IDS_COPY_MIDDLE_TO_LEFT2 41628\r
+#define IDS_COPY_MIDDLE_TO_RIGHT2 41629\r
+#define IDS_COPY_LEFT_TO_RIGHT2 41630\r
+#define IDS_COPY_LEFT_TO_MIDDLE2 41631\r
+#define IDS_COPY_LEFT_TO 41632\r
+#define IDS_COPY_MIDDLE_TO 41633\r
+#define IDS_COPY_RIGHT_TO 41634\r
+#define IDS_COPY_BOTH_TO 41635\r
+#define IDS_COPY_ALL_TO 41638\r
+#define IDS_COPY_DIFFERENCES_TO 41639\r
+#define IDS_COPY_LEFT_TO2 41640\r
+#define IDS_COPY_MIDDLE_TO2 41641\r
+#define IDS_COPY_RIGHT_TO2 41642\r
+#define IDS_COPY_BOTH_TO2 41643\r
+#define IDS_COPY_ALL_TO2 41645\r
+#define IDS_COPY_DIFFERENCES_TO2 41646\r
+#define IDS_DEL_LEFT_FMT 41671\r
+#define IDS_DEL_MIDDLE_FMT 41672\r
+#define IDS_DEL_RIGHT_FMT 41673\r
+#define IDS_DEL_BOTH_FMT 41674\r
+#define IDS_DEL_ALL_FMT 41675\r
+#define IDS_DEL_LEFT_FMT2 41676\r
+#define IDS_DEL_MIDDLE_FMT2 41677\r
+#define IDS_DEL_RIGHT_FMT2 41678\r
+#define IDS_DEL_BOTH_FMT2 41679\r
+#define IDS_DEL_ALL_FMT2 41680\r
+#define IDS_MOVE_LEFT_TO 41681\r
+#define IDS_MOVE_MIDDLE_TO 41682\r
+#define IDS_MOVE_RIGHT_TO 41683\r
+#define IDS_MOVE_LEFT_TO2 41684\r
+#define IDS_MOVE_MIDDLE_TO2 41685\r
+#define IDS_MOVE_RIGHT_TO2 41686\r
+#define IDS_SELECT_DEST_LEFT 41687\r
+#define IDS_SELECT_DEST_MIDDLE 41688\r
+#define IDS_SELECT_DEST_RIGHT 41689\r
+#define IDS_FILES_AFFECTED_FMT 41690\r
+#define IDS_FILES_AFFECTED_FMT2 41691\r
+#define IDS_CONFIRM_DELETE_SINGLE 41692\r
+#define IDS_CONFIRM_SINGLE_COPY 41693\r
+#define IDS_CONFIRM_MULTIPLE_COPY 41694\r
+#define IDS_DIRCMP_NOTSYNC 41695\r
+#define IDS_CONFIRM_SINGLE_MOVE 41696\r
+#define IDS_CONFIRM_MULTIPLE_MOVE 41697\r
+#define IDS_CONFIRM_COPY_CAPTION 41698\r
+#define IDS_CONFIRM_MOVE_CAPTION 41699\r
+#define IDS_CONFIRM_CLOSE_WINDOW 41700\r
+#define IDS_ERROR_EXECUTE_FILE 41719\r
+#define IDS_UNKNOWN_ARCHIVE_FORMAT 41731\r
+#define IDS_COLHDR_FILENAME 41751\r
+#define IDS_COLHDR_DIR 41752\r
+#define IDS_COLHDR_RESULT 41753\r
+#define IDS_COLHDR_LTIMEM 41754\r
+#define IDS_COLHDR_RTIMEM 41755\r
+#define IDS_COLHDR_MTIMEM 41756\r
+#define IDS_COLHDR_EXTENSION 41757\r
+#define IDS_COLHDR_LSIZE 41758\r
+#define IDS_COLHDR_RSIZE 41759\r
+#define IDS_COLHDR_MSIZE 41760\r
+#define IDS_COLHDR_RSIZE_SHORT 41761\r
+#define IDS_COLHDR_LSIZE_SHORT 41762\r
+#define IDS_COLHDR_MSIZE_SHORT 41763\r
+#define IDS_COLHDR_LTIMEC 41781\r
+#define IDS_COLHDR_RTIMEC 41782\r
+#define IDS_COLHDR_MTIMEC 41783\r
+#define IDS_COLHDR_NEWER 41784\r
+#define IDS_COLHDR_LVERSION 41785\r
+#define IDS_COLHDR_RVERSION 41786\r
+#define IDS_COLHDR_MVERSION 41787\r
+#define IDS_COLHDR_RESULT_ABBR 41788\r
+#define IDS_COLHDR_LATTRIBUTES 41789\r
+#define IDS_COLHDR_RATTRIBUTES 41790\r
+#define IDS_COLHDR_MATTRIBUTES 41791\r
+#define IDS_COLHDR_LEOL_TYPE 41792\r
+#define IDS_COLHDR_MEOL_TYPE 41793\r
+#define IDS_COLHDR_REOL_TYPE 41794\r
+#define IDS_COLHDR_LENCODING 41811\r
+#define IDS_COLHDR_RENCODING 41812\r
+#define IDS_COLHDR_MENCODING 41813\r
+#define IDS_COLHDR_NIDIFFS 41814\r
+#define IDS_COLHDR_NSDIFFS 41815\r
+#define IDS_COLHDR_BINARY 41816\r
+#define IDS_COLHDR_UNPACKER 41817\r
+#define IDS_COLHDR_PREDIFFER 41818\r
+#define IDS_CANT_COMPARE_FILES 41831\r
+#define IDS_ABORTED_ITEM 41832\r
+#define IDS_FILE_SKIPPED 41833\r
+#define IDS_DIR_SKIPPED 41834\r
+#define IDS_LEFT_ONLY_IN_FMT 41835\r
+#define IDS_MIDDLE_ONLY_IN_FMT 41836\r
+#define IDS_RIGHT_ONLY_IN_FMT 41837\r
+#define IDS_DOES_NOT_EXIST_IN_FMT 41838\r
+#define IDS_BIN_FILES_SAME 41839\r
+#define IDS_IDENTICAL 41840\r
+#define IDS_BIN_FILES_DIFF 41841\r
+#define IDS_FILES_ARE_DIFFERENT 41842\r
+#define IDS_FOLDERS_ARE_DIFFERENT 41843\r
+#define IDS_LEFTONLY 41844\r
+#define IDS_RIGHTONLY 41845\r
+#define IDS_MIDDLEONLY 41846\r
+#define IDS_NOITEMLEFT 41847\r
+#define IDS_NOITEMRIGHT 41848\r
+#define IDS_NOITEMMIDDLE 41849\r
+#define IDS_DIFFERENT 41850\r
+#define IDS_CMPRES_ERROR 41851\r
+#define IDS_TEXT_FILES_SAME 41852\r
+#define IDS_TEXT_FILES_DIFF 41861\r
+#define IDS_LEFTONLY_DIFF 41862\r
+#define IDS_MIDDLEONLY_DIFF 41863\r
+#define IDS_RIGHTONLY_DIFF 41864\r
+#define IDS_IMAGE_FILES_SAME 41865\r
+#define IDS_IMAGE_FILES_DIFF 41866\r
+#define IDS_ELAPSED_TIME 41881\r
+#define IDS_STATUS_SELITEM1 41882\r
+#define IDS_STATUS_SELITEMS 41883\r
+#define IDS_COLDESC_FILENAME 41901\r
+#define IDS_COLDESC_DIR 41902\r
+#define IDS_COLDESC_RESULT 41903\r
+#define IDS_COLDESC_LTIMEM 41904\r
+#define IDS_COLDESC_RTIMEM 41905\r
+#define IDS_COLDESC_MTIMEM 41906\r
+#define IDS_COLDESC_EXTENSION 41907\r
+#define IDS_COLDESC_LSIZE 41908\r
+#define IDS_COLDESC_RSIZE 41909\r
+#define IDS_COLDESC_MSIZE 41910\r
+#define IDS_COLDESC_LSIZE_SHORT 41911\r
+#define IDS_COLDESC_RSIZE_SHORT 41912\r
+#define IDS_COLDESC_MSIZE_SHORT 41913\r
+#define IDS_COLDESC_LTIMEC 41914\r
+#define IDS_COLDESC_RTIMEC 41915\r
+#define IDS_COLDESC_MTIMEC 41916\r
+#define IDS_COLDESC_NEWER 41917\r
+#define IDS_COLDESC_LVERSION 41918\r
+#define IDS_COLDESC_RVERSION 41919\r
+#define IDS_COLDESC_MVERSION 41920\r
+#define IDS_COLDESC_RESULT_ABBR 41921\r
+#define IDS_COLDESC_LATTRIBUTES 41922\r
+#define IDS_COLDESC_RATTRIBUTES 41923\r
+#define IDS_COLDESC_MATTRIBUTES 41924\r
+#define IDS_COLDESC_LEOL_TYPE 41925\r
+#define IDS_COLDESC_REOL_TYPE 41926\r
+#define IDS_COLDESC_MEOL_TYPE 41927\r
+#define IDS_COLDESC_LENCODING 41941\r
+#define IDS_COLDESC_RENCODING 41942\r
+#define IDS_COLDESC_MENCODING 41943\r
+#define IDS_COLDESC_NIDIFFS 41944\r
+#define IDS_COLDESC_NSDIFFS 41945\r
+#define IDS_COLDESC_BINARY 41946\r
+#define IDS_COLDESC_UNPACKER 41947\r
+#define IDS_COLDESC_PREDIFFER 41948\r
+#define IDS_DIRECTORY_REPORT_TITLE 41962\r
+#define IDS_REPORT_COMMALIST 41963\r
+#define IDS_REPORT_TABLIST 41964\r
+#define IDS_REPORT_SIMPLEHTML 41965\r
+#define IDS_REPORT_SIMPLEXML 41966\r
+#define IDS_REPORT_FILEOVERWRITE 41967\r
+#define IDS_REPORT_ERROR 41968\r
+#define IDS_REPORT_SUCCESS 41969\r
+#define IDS_SYNCPOINT_LASTBLOCK 41970\r
+#define IDS_FILE_TO_ITSELF 42100\r
+#define IDS_FILESSAME 42101\r
+#define IDS_FILEERROR 42103\r
+#define IDS_TEMP_FILEERROR 42105\r
+#define IDS_SUGGEST_IGNOREEOL 42107\r
+#define IDS_INVALID_DIRECTORY 42108\r
+#define IDS_CANNOT_OPEN_BINARYFILE 42109\r
+#define IDS_CREATE_PAIR_FOLDER 42110\r
+#define IDS_MOVE_TO_NEXTFILE 42111\r
+#define IDS_MOVE_TO_PREVFILE 42112\r
+#define IDS_MOVE_TO_NEXTPAGE 42113\r
+#define IDS_MOVE_TO_PREVPAGE 42114\r
+#define IDS_MOVE_TO_FIRSTFILE 42115\r
+#define IDS_MOVE_TO_LASTFILE 42116\r
+#define IDS_SUGGEST_IGNORECODEPAGE 42131\r
+#define IDS_LOSSY_TRANSCODING_FIRST 42132\r
+#define IDS_LOSSY_TRANSCODING_SECOND 42133\r
+#define IDS_LOSSY_TRANSCODING_THIRD 42134\r
+#define IDS_LOSSY_TRANSCODING_BOTH 42135\r
+#define IDS_LINEDIFF_NODIFF 42151\r
+#define IDS_LINEDIFF_NODIFF_CAPTION 42152\r
+#define IDS_NUM_REPLACED 42161\r
+#define IDS_EDIT_TEXT_NOT_FOUND 42162\r
+#define IDS_MERGE_MODE 42181\r
+#define IDS_LOCBAR_CAPTION 42201\r
+#define IDS_DIFFBAR_CAPTION 42202\r
+#define IDS_DIFF_SUCCEEDED 42400\r
+#define IDS_DIFF_ITEM1NOTFOUND 42401\r
+#define IDS_DIFF_ITEM2NOTFOUND 42402\r
+#define IDS_DIFF_FILEOVERWRITE 42403\r
+#define IDS_DIFF_SELECTEDFILES 42404\r
+#define IDS_DIFF_NORMAL 42405\r
+#define IDS_DIFF_CONTEXT 42406\r
+#define IDS_DIFF_UNIFIED 42407\r
+#define IDS_DIFF_HTML 42408\r
+#define IDS_FILEWRITE_ERROR 42409\r
+#define IDS_PATH_NOT_ABSOLUTE 42410\r
+#define IDS_MUST_SPECIFY_OUTPUT 42411\r
+#define IDS_CANNOT_CREATE_BINARYPATCH 42412\r
+#define IDS_CANNOT_CREATE_DIRPATCH 42413\r
+#define IDS_SAVEFILES_FORPATCH 42414\r
+#define IDS_FOLDER_NOTEXIST 42415\r
+#define IDS_NO_ZIP_SUPPORT 42449\r
+#define IDS_OPT_EXPORT_CAPTION 42452\r
+#define IDS_OPT_IMPORT_CAPTION 42453\r
+#define IDS_OPT_IMPORT_DONE 42454\r
+#define IDS_OPT_EXPORT_DONE 42455\r
+#define IDS_OPT_IMPORT_ERR 42456\r
+#define IDS_OPT_EXPORT_ERR 42457\r
+#define IDS_CLOSEALL_WINDOWS 42458\r
+#define IDS_BREAK_ON_WHITESPACE 42491\r
+#define IDS_BREAK_ON_PUNCTUATION 42492\r
+#define IDS_UNK_ERROR_READING_PROJECT 42510\r
+#define IDS_UNK_ERROR_SAVING_PROJECT 42511\r
+#define IDS_PROJFILE_LOAD_SUCCESS 42513\r
+#define IDS_PROJFILE_SAVE_SUCCESS 42514\r
+#define IDS_TEXT_REPORT_FILES 42540\r
+#define IDS_HTML_REPORT_FILES 42541\r
+#define IDS_XML_REPORT_FILES 42542\r
+#define IDS_AUTOCOMPLETE_DISABLED 43142\r
+#define IDS_AUTOCOMPLETE_FILE_SYS 43143\r
+#define IDS_LOCBAR_GOTOLINE_FMT 43115\r
+#define IDS_AUTOCOMPLETE_MRU 43144\r
+#define IDS_FRHED_NOTINSTALLED 43229\r
+#define IDS_AUTO_MERGE 43241\r
+#define IDS_CODEPAGE_MERGED 43244\r
+#define IDS_CODEPAGE_CONFLICT 43245\r
+#define IDS_EOL_MERGED 43246\r
+#define IDS_EOL_CONFLICT 43247\r
+#define IDS_IMAGE_MENU 43352\r
+#define IDS_EOL_DOS 43400\r
+#define IDS_EOL_MAC 43401\r
+#define IDS_EOL_UNIX 43402\r
+#define IDS_EOL_MIXED 43403\r
+#define IDS_EOL_BIN 43404\r
+#define IDS_EOL_LF 43405\r
+#define IDS_EOL_CR 43406\r
+#define IDS_EOL_CRLF 43407\r
+#define IDS_EOL_NONE 43408\r
+#define IDS_MARKER_COLOR_FMT 43409\r
+#define IDS_MARKER_NEW_PATTERN 43410\r
+#define IDS_PLUGINSLIST_NAME 43432\r
+#define IDS_PLUGINSLIST_TYPE 43433\r
+#define IDS_PLUGINSLIST_DESC 43434\r
+#define IDS_PLUGINS_TYPE_UNPACKER 43435\r
+#define IDS_PLUGINS_TYPE_PREDIFFER 43436\r
+#define IDS_PLUGINS_TYPE_EDITSCRIPT 43437\r
+#define IDS_GOTO_MOVED_LINE 43438\r
+#define IDS_COMPMETHOD_FULL_CONTENTS 43490\r
+#define IDS_COMPMETHOD_QUICK_CONTENTS 43491\r
+#define IDS_COMPMETHOD_BINARY_CONTENTS 43492\r
+#define IDS_COMPMETHOD_MODDATE 43493\r
+#define IDS_COMPMETHOD_DATESIZE 43494\r
+#define IDS_COMPMETHOD_SIZE 43495\r
+#define IDS_SYNTAXTABLE_FILETYPE 43496\r
+#define IDS_SYNTAXTABLE_EXTENSION 43497\r
+#define IDS_UNPACK_AUTO 43498\r
+#define IDS_NO_PREDIFFER 43501\r
+#define IDS_SUGGESTED_PLUGINS 43502\r
+#define IDS_NOT_SUGGESTED_PLUGINS 43503\r
+#define IDS_PRIVATEBUILD_FMT 43504\r
+#define IDS_CHECKFORUPDATES_UPTODATE 43521\r
+#define IDS_CHECKFORUPDATES_NEWVERSION 43522\r
+#define IDS_CHECKFORUPDATES_FAILED 43523\r
+#define IDS_TITLE_PLUGINS_SETTINGS 43524\r
+#define IDS_NO_EDIT_SCRIPTS 43525\r
+#define IDS_NO_SCT_SCRIPTS 43541\r
+#define IDS_USERCHOICE_NONE 43542\r
+#define IDS_USERCHOICE_AUTOMATIC 43543\r
+#define IDS_CLOSE_LEFT_TABS 43544\r
+#define IDS_CLOSE_RIGHT_TABS 43545\r
+#define IDS_CLOSE_OTHER_TABS 43644\r
+#define IDS_TABBAR_AUTO_MAXWIDTH 43645\r
+#define IDS_CREATE_FOLDER 43657\r
+#define IDS_CREATE_FOLDER_ERROR 43658\r
+#define IDS_DIFF_ALGORITHM_DEFAULT 43700\r
+#define IDS_DIFF_ALGORITHM_MINIMAL 43701\r
+#define IDS_DIFF_ALGORITHM_PATIENCE 43702\r
+#define IDS_DIFF_ALGORITHM_HISTOGRAM 43703\r
+#define IDS_RENDERING_MODE_GDI 43710\r
+#define IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT 43711\r
+#define IDS_RENDERING_MODE_DIRECTWRITE_ALIASED 43712\r
+#define IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC 43713\r
+#define IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL 43714\r
+#define IDS_RENDERING_MODE_DIRECTWRITE_NATURAL 43715\r
+#define IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC 43716\r
+#define IDS_CLOSE_WINDOWS_WITH_ESC_1 43717\r
+#define IDS_CLOSE_WINDOWS_WITH_ESC_2 43718\r
+#define IDS_DIFF_GROUP 44131\r
+#define IDS_DIFF_HIGHLIGHT 44132\r
+#define IDS_DIFF_BLINK 44133\r
+#define IDS_DIFF_BLOCKSIZE 44134\r
+#define IDS_DIFF_BLOCKALPHA 44135\r
+#define IDS_DIFF_CDTHRESHOLD 44136\r
+#define IDS_DIFF_INSERTION_DELETION_DETECTION 44137\r
+#define IDS_DIFF_INSERTION_DELETION_DETECTION_NONE 44138\r
+#define IDS_DIFF_INSERTION_DELETION_DETECTION_VERTICAL 44139\r
+#define IDS_DIFF_INSERTION_DELETION_DETECTION_HORIZONTAL 44140\r
+#define IDS_OVERLAY_GROUP 44141\r
+#define IDS_OVERLAY_ALPHA 44142\r
+#define IDS_OVERLAY_MODE_NONE 44143\r
+#define IDS_OVERLAY_MODE_XOR 44144\r
+#define IDS_OVERLAY_MODE_ALPHA 44145\r
+#define IDS_OVERLAY_MODE_ALPHA_ANIMATION 44146\r
+#define IDS_ZOOM 44147\r
+#define IDS_PAGE 44148\r
+#define IDS_IMGCMP_STATUS_PT_RGBA_FMT 44149\r
+#define IDS_IMGCMP_STATUS_DIST1_FMT 44150\r
+#define IDS_IMGCMP_STATUS_DIST2_FMT 44151\r
+#define IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT 44152\r
+#define IDS_IMGCMP_STATUS_RC_FMT 44153\r
+#define IDS_COMPARE_LARGE_FILES 44154\r
+#define IDS_OCRRESULT_TEXTONLY 44166\r
+#define IDS_OCRRESULT_POS_LINE 44167\r
+#define IDS_OCRRESULT_POS_WORD 44168\r
+#define IDS_IGNSUB_STR1 44174\r
+#define IDS_IGNSUB_STR2 44175\r
+#define IDS_IGNSUB_STR3 44176\r
+#define IDS_IGNSUB_STR4 44177\r
+#define IDS_IGNSUB_STR5 44178\r
+#define IDS_SINGLEINSTANCE_STR1 44179\r
+#define IDS_SINGLEINSTANCE_STR2 44180\r
+#define IDS_PLUGIN_ALL 44200\r
+#define IDS_PLUGIN_PROCESS_TYPE1 44201\r
+#define IDS_PLUGIN_PROCESS_TYPE2 44202\r
+#define IDS_PLUGIN_PROCESS_TYPE3 44203\r
+#define IDS_PLUGIN_PROCESS_TYPE4 44204\r
+#define IDS_PLUGIN_PROCESS_TYPE5 44205\r
+#define IDS_PLUGIN_PROCESS_TYPE6 44206\r
+#define IDS_PLUGIN_PROCESS_TYPE7 44207\r
+#define IDS_PLUGIN_PROCESS_TYPE8 44208\r
+#define IDS_PLUGIN_PROCESS_TYPE9 44209\r
+#define IDS_PLUGIN_MENU_CAPTION1 44211\r
+#define IDS_PLUGIN_MENU_CAPTION2 44212\r
+#define IDS_PLUGIN_MENU_CAPTION3 44213\r
+#define IDS_PLUGIN_MENU_CAPTION4 44214\r
+#define IDS_PLUGIN_MENU_CAPTION5 44215\r
+#define IDS_PLUGIN_MENU_CAPTION6 44216\r
+#define IDS_PLUGIN_MENU_CAPTION7 44217\r
+#define IDS_PLUGIN_MENU_CAPTION8 44218\r
+#define IDS_PLUGIN_MENU_CAPTION9 44219\r
+#define IDS_PLUGIN_MENU_CAPTION10 44220\r
+#define IDS_PLUGIN_MENU_CAPTION11 44221\r
+#define IDS_PLUGIN_MENU_CAPTION12 44222\r
+#define IDS_PLUGIN_MENU_CAPTION13 44223\r
+#define IDS_PLUGIN_MENU_CAPTION14 44224\r
+#define IDS_PLUGIN_MENU_CAPTION15 44225\r
+#define IDS_PLUGIN_MENU_CAPTION16 44226\r
+#define IDS_PLUGIN_MENU_CAPTION17 44227\r
+#define IDS_PLUGIN_MENU_CAPTION18 44228\r
+#define IDS_PLUGIN_MENU_CAPTION19 44229\r
+#define IDS_PLUGIN_MENU_CAPTION20 44230\r
+#define IDS_PLUGIN_MENU_CAPTION21 44231\r
+#define IDS_PLUGIN_MENU_CAPTION22 44232\r
+#define IDS_PLUGIN_MENU_CAPTION23 44233\r
+#define IDS_PLUGIN_MENU_CAPTION24 44234\r
+#define IDS_PLUGIN_MENU_CAPTION25 44235\r
+#define IDS_PLUGIN_MENU_CAPTION26 44236\r
+#define IDS_PLUGIN_MENU_CAPTION27 44237\r
+#define IDS_PLUGIN_MENU_CAPTION28 44238\r
+#define IDS_PLUGIN_MENU_CAPTION29 44239\r
+#define IDS_PLUGIN_MENU_CAPTION30 44240\r
+#define IDS_PLUGIN_MISSING_PLUGIN_NAME 44241\r
+#define IDS_PLUGIN_MISSING_QUOTATION_MARK 44242\r
+#define IDS_PLUGIN_TITLE1 44243\r
+#define IDS_PLUGIN_DESCRIPTION1 44251\r
+#define IDS_PLUGIN_DESCRIPTION2 44252\r
+#define IDS_PLUGIN_DESCRIPTION3 44253\r
+#define IDS_PLUGIN_DESCRIPTION4 44254\r
+#define IDS_PLUGIN_DESCRIPTION5 44255\r
+#define IDS_PLUGIN_DESCRIPTION6 44256\r
+#define IDS_PLUGIN_DESCRIPTION7 44257\r
+#define IDS_PLUGIN_DESCRIPTION8 44258\r
+#define IDS_PLUGIN_DESCRIPTION9 44259\r
+#define IDS_PLUGIN_DESCRIPTION10 44260\r
+#define IDS_PLUGIN_DESCRIPTION11 44261\r
+#define IDS_PLUGIN_DESCRIPTION12 44262\r
+#define IDS_PLUGIN_DESCRIPTION13 44263\r
+#define IDS_PLUGIN_DESCRIPTION14 44264\r
+#define IDS_PLUGIN_DESCRIPTION15 44265\r
+#define IDS_PLUGIN_DESCRIPTION16 44266\r
+#define IDS_PLUGIN_DESCRIPTION17 44267\r
+#define IDS_PLUGIN_DESCRIPTION18 44268\r
+#define IDS_PLUGIN_DESCRIPTION19 44269\r
+#define IDS_PLUGIN_DESCRIPTION20 44270\r
+#define IDS_PLUGIN_DESCRIPTION21 44271\r
+#define IDS_PLUGIN_DESCRIPTION22 44272\r
+#define IDS_PLUGIN_DESCRIPTION23 44273\r
+#define IDS_PLUGIN_DESCRIPTION24 44274\r
+#define IDS_PLUGIN_DESCRIPTION25 44275\r
+#define IDS_PLUGIN_DESCRIPTION26 44276\r
+#define IDS_PLUGIN_DESCRIPTION27 44277\r
+#define IDS_PLUGIN_DESCRIPTION28 44278\r
+#define IDS_PLUGIN_DESCRIPTION29 44279\r
+#define IDS_PLUGIN_DESCRIPTION30 44280\r
\r
// Next default values for new objects\r
// \r
#ifdef APSTUDIO_INVOKED\r
#ifndef APSTUDIO_READONLY_SYMBOLS\r
#define _APS_3D_CONTROLS 1\r
-#define _APS_NEXT_RESOURCE_VALUE 251\r
-#define _APS_NEXT_COMMAND_VALUE 33660\r
-#define _APS_NEXT_CONTROL_VALUE 8830\r
-#define _APS_NEXT_SYMED_VALUE 116\r
+#define _APS_NEXT_RESOURCE_VALUE 253\r
+#define _APS_NEXT_COMMAND_VALUE 34194\r
+#define _APS_NEXT_CONTROL_VALUE 1619\r
+#define _APS_NEXT_SYMED_VALUE 118\r
#endif\r
#endif\r
OSDN Git Service
