OSDN Git Service

"&Include Subfolders" -> "&Include subfolders"
[winmerge-jp/winmerge-jp.git] / Src / Merge.rc
index 5afa64b..8842211 100644 (file)
@@ -94,6 +94,7 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "Select Line &Difference\tF4", ID_SELECTLINEDIFF\r
         MENUITEM "Add this change to Substitution &Filters", ID_ADD_TO_IGNORED_SUBSTITUTIONS\r
+        MENUITEM "Add to &Line Filters",        ID_ADD_TO_LINE_FILTERS\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Undo",                       ID_EDIT_UNDO\r
         MENUITEM "&Redo",                       ID_EDIT_REDO\r
@@ -862,8 +863,14 @@ BEGIN
         END\r
         POPUP "&Move"\r
         BEGIN\r
+            MENUITEM "Left to Middle (%1 of %2)",   ID_DIR_MOVE_LEFT_TO_MIDDLE\r
+            MENUITEM "Left to Right (%1 of %2)",    ID_DIR_MOVE_LEFT_TO_RIGHT\r
             MENUITEM "Left to... (%1 of %2)",       ID_DIR_MOVE_LEFT_TO_BROWSE\r
+            MENUITEM "Middle to Left (%1 of %2)",   ID_DIR_MOVE_MIDDLE_TO_LEFT\r
+            MENUITEM "Middle to Right (%1 of %2)",  ID_DIR_MOVE_MIDDLE_TO_RIGHT\r
             MENUITEM "Middle to... (%1 of %2)",     ID_DIR_MOVE_MIDDLE_TO_BROWSE\r
+            MENUITEM "Right to Middle (%1 of %2)",  ID_DIR_MOVE_RIGHT_TO_MIDDLE\r
+            MENUITEM "Right to Left (%1 of %2)",    ID_DIR_MOVE_RIGHT_TO_LEFT\r
             MENUITEM "Right to... (%1 of %2)",      ID_DIR_MOVE_RIGHT_TO_BROWSE\r
         END\r
         POPUP "&Delete"\r
@@ -916,6 +923,7 @@ BEGIN
             MENUITEM "Both (%1 of %2)",             ID_DIR_COPY_BOTH_TO_CLIPBOARD\r
             MENUITEM "All (%1 of %2)",              ID_DIR_COPY_ALL_TO_CLIPBOARD\r
         END\r
+        MENUITEM "Copy All Di&splayed Columns"       ID_DIR_COPY_ALL_DISP_COLUMNS\r
         MENUITEM SEPARATOR\r
         POPUP "&Zip"\r
         BEGIN\r
@@ -949,7 +957,8 @@ BEGIN
         MENUITEM "&Copy Full Path",             ID_EDITOR_COPY_PATH\r
         MENUITEM "Copy &Filename",              ID_EDITOR_COPY_FILENAME\r
         MENUITEM "&Edit Caption",               ID_EDITOR_EDIT_CAPTION\r
-        MENUITEM "&Select...",                  ID_EDITOR_SELECT_FILE\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Open...",                    ID_EDITOR_SELECT_FILE\r
     END\r
 END\r
 \r
@@ -998,7 +1007,7 @@ BEGIN
         MENUITEM "Ignore num&bers",             IDC_DIFF_IGNORENUMBERS\r
         MENUITEM "Ignore c&omment differences", ID_DIFF_OPTIONS_IGNORE_COMMENTS\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Include Subfolders",         ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS\r
+        MENUITEM "&Include subfolders",         ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS\r
         POPUP "&Compare method:"\r
         BEGIN\r
             MENUITEM "Full Contents",               ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS\r
@@ -1138,6 +1147,7 @@ BEGIN
     END\r
 END\r
 \r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Accelerator\r
@@ -1278,7 +1288,10 @@ BEGIN
     LTEXT           " Folder: Filter",IDC_FILES_DIRS_GROUP3,10,198,86,11\r
     COMBOBOX        IDC_EXT_COMBO,10,209,140,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     PUSHBUTTON      "&Select...",IDC_SELECT_FILTER,153,209,73,14\r
-    CONTROL         "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,227,143,10\r
+    CONTROL         "&Include subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,227,143,10\r
+    LTEXT           " File: Prediffer Plugin",IDC_FILES_DIRS_GROUP5,10,198,120,11,NOT WS_VISIBLE\r
+    CONTROL         "",IDC_PREDIFFER_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP,10,209,140,95\r
+    PUSHBUTTON      "&Select...",IDC_SELECT_PREDIFFER,153,209,73,14,NOT WS_VISIBLE\r
     GROUPBOX        "",IDC_FILES_DIRS_GROUP4X,236,197,224,42\r
     LTEXT           " File: Unpacker Plugin",IDC_FILES_DIRS_GROUP4,240,198,86,11\r
     CONTROL         "",IDC_UNPACKER_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,240,209,140,140\r
@@ -1310,14 +1323,16 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,270,10\r
     CONTROL         "&Preserve file time in file compare",IDC_PRESERVE_FILETIME,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,270,10\r
-    CONTROL         "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,\r
+    CONTROL         "Show ""Select Files or Folders"" dialog on startup",IDC_STARTUP_FOLDER_SELECT,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,270,10\r
-    CONTROL         "Close ""Select Files or Folders"" Dialog on clicking Compare button",IDC_CLOSE_WITH_OK,\r
+    CONTROL         "Close ""Select Files or Folders"" dialog on clicking Compare button",IDC_CLOSE_WITH_OK,\r
                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,131,270,10\r
-    LTEXT           "Op&en-dialog Auto-Completion:",IDC_STATIC,7,145,270,10\r
-    COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,7,159,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "Language:",IDC_STATIC,7,175,270,10\r
-    COMBOBOX        IDC_LANGUAGE_LIST,7,187,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "Op&en-dialog Auto-Completion:",IDC_STATIC,7,141,270,10\r
+    COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,7,152,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "Auto-&reload modified files:",IDC_STATIC,7,167,270,10\r
+    COMBOBOX        IDC_AUTO_RELOAD_MODIFIED_FILES,7,178,270,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "Language:",IDC_STATIC,7,193,270,10\r
+    COMBOBOX        IDC_LANGUAGE_LIST,7,204,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
 END\r
 \r
 IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96\r
@@ -1605,7 +1620,7 @@ CAPTION "Select Plugin"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
     LTEXT           "Plugin &Name:",IDC_STATIC,7,9,83,10\r
-    COMBOBOX        IDC_PLUGIN_NAME,92,7,220,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "",IDC_PLUGIN_NAME,"ComboBoxEx32",CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,92,7,220,200\r
     LTEXT           "Extensions list:",IDC_STATIC,7,26,83,10\r
     EDITTEXT        IDC_PLUGIN_SUPPORTED_EXTENSIONS,92,24,220,12,ES_AUTOHSCROLL | ES_READONLY\r
     LTEXT           "Description:",IDC_STATIC,7,43,83,10\r
@@ -2041,24 +2056,26 @@ BEGIN
     PUSHBUTTON      "&Close",IDCANCEL,192,121,50,14\r
 END\r
 \r
-IDD_OPEN_TABLE DIALOGEX 0, 0, 239, 151\r
+IDD_OPEN_TABLE DIALOGEX 0, 0, 239, 181\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Table"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    GROUPBOX        "File type",IDC_STATIC,6,6,222,78\r
+    GROUPBOX        "File type",IDC_STATIC,6,6,222,108\r
     CONTROL         "&CSV",IDC_COMPARETABLE_CSV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,18,210,10\r
-    CONTROL         "&TSV",IDC_COMPARETABLE_TSV,"Button",BS_AUTORADIOBUTTON,12,30,210,10\r
+    CONTROL         "&TSV",IDC_COMPARETABLE_TSV,"Button",BS_AUTORADIOBUTTON,12,58,210,10\r
     CONTROL         "Custom &Delimiter-Separated Values",IDC_COMPARETABLE_DSV,\r
-                    "Button",BS_AUTORADIOBUTTON,12,42,210,10\r
-    LTEXT           "D&elimiter character:",IDC_STATIC,24,54,198,10\r
-    EDITTEXT        IDC_COMPARETABLE_DSV_DELIM_CHAR,24,66,30,14,ES_AUTOHSCROLL | WS_DISABLED\r
+                    "Button",BS_AUTORADIOBUTTON,12,70,210,10\r
+    LTEXT           "D&elimiter character:",IDC_STATIC,24,30,198,10\r
+    EDITTEXT        IDC_COMPARETABLE_CSV_DELIM_CHAR,24,42,30,14,ES_AUTOHSCROLL\r
+    LTEXT           "D&elimiter character:",IDC_STATIC,24,82,198,10\r
+    EDITTEXT        IDC_COMPARETABLE_DSV_DELIM_CHAR,24,94,30,14,ES_AUTOHSCROLL | WS_DISABLED\r
     CONTROL         "&Allow newlines in quotes",IDC_COMPARETABLE_ALLOWNEWLINE,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,90,222,10\r
-    LTEXT           "&Quote character:",IDC_STATIC,6,102,222,10\r
-    EDITTEXT        IDC_COMPARETABLE_QUOTE_CHAR,6,114,30,14,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,93,126,66,18\r
-    PUSHBUTTON      "Cancel",IDCANCEL,165,126,66,18\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,118,222,10\r
+    LTEXT           "&Quote character:",IDC_STATIC,6,130,222,10\r
+    EDITTEXT        IDC_COMPARETABLE_QUOTE_CHAR,6,142,30,14,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,93,154,66,18\r
+    PUSHBUTTON      "Cancel",IDCANCEL,165,154,66,18\r
 END\r
 \r
 IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 285, 242\r
@@ -2142,15 +2159,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Shell Integration"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    GROUPBOX        "Explorer",IDC_STATIC,7,6,270,144\r
-    CONTROL         "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,240,10\r
+    GROUPBOX        "Explorer",IDC_STATIC,7,6,270,156\r
     CONTROL         "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,250,10\r
-    PUSHBUTTON      "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,250,14\r
-    PUSHBUTTON      "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,250,14\r
-    PUSHBUTTON      "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,80,250,14\r
-    PUSHBUTTON      "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,96,250,14\r
-    PUSHBUTTON      "Register shell extension for &Windows 11 or later",IDC_REGISTER_WINMERGECONTEXTMENU,17,112,250,14\r
-    PUSHBUTTON      "Unregister shell extension for W&indows 11 or later",IDC_UNREGISTER_WINMERGECONTEXTMENU,17,128,250,14\r
+    CONTROL         "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,240,10\r
+    CONTROL         "Enable &Compare As menu",IDC_EXPLORER_COMPARE_AS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,42,240,10\r
+    PUSHBUTTON      "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,60,250,14\r
+    PUSHBUTTON      "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,76,250,14\r
+    PUSHBUTTON      "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,92,250,14\r
+    PUSHBUTTON      "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,108,250,14\r
+    PUSHBUTTON      "Register shell extension for &Windows 11 or later",IDC_REGISTER_WINMERGECONTEXTMENU,17,124,250,14\r
+    PUSHBUTTON      "Unregister shell extension for W&indows 11 or later",IDC_UNREGISTER_WINMERGECONTEXTMENU,17,140,250,14\r
 END\r
 \r
 IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 285, 242\r
@@ -2164,18 +2182,18 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,36,279,10\r
     CONTROL         "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,48,279,10\r
+    CONTROL         "&Include subfolders", IDC_RECURS_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 6, 60, 279, 10\r
     CONTROL         "Include &unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,60,279,10\r
-    CONTROL         "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,72,279,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,72,279,10\r
     CONTROL         "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,84,279,10\r
-    CONTROL         "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,96,279,10\r
+    CONTROL         "Ignore &reparse points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,96,279,10\r
     LTEXT           "Threshold for switching to &quick compare (MB):",IDC_STATIC,6,108,279,10\r
     EDITTEXT        IDC_COMPARE_QUICKC_LIMIT,6,120,30,14,ES_AUTOHSCROLL\r
     LTEXT           "Threshold for switching to &binary compare (MB):",IDC_STATIC,6,138,279,10\r
     EDITTEXT        IDC_COMPARE_BINARYC_LIMIT,6,150,30,14,ES_AUTOHSCROLL\r
-    LTEXT           "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,6,166,239,30\r
-    EDITTEXT        IDC_COMPARE_THREAD_COUNT,6,198,30,14,ES_AUTOHSCROLL\r
+    LTEXT           "&Number of CPU cores to use:",IDC_STATIC,6,166,239,30\r
+    EDITTEXT        IDC_COMPARE_THREAD_COUNT,6,178,30,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
 END\r
 \r
@@ -2184,20 +2202,24 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Table"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    LTEXT           "&CSV File Patterns:",IDC_STATIC,6,6,270,10\r
-    COMBOBOX        IDC_COMPARETABLE_CSV_PATTERNS,7,18,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "&TSV File Patterns:",IDC_STATIC,7,36,270,10\r
-    COMBOBOX        IDC_COMPARETABLE_TSV_PATTERNS,7,48,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    GROUPBOX        "Custom Delimiter-Separated Values",IDC_STATIC,6,66,270,72\r
-    LTEXT           "File Patterns:",IDC_STATIC,12,78,258,10\r
-    COMBOBOX        IDC_COMPARETABLE_DSV_PATTERNS,12,90,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    LTEXT           "D&elimiter character:",IDC_STATIC,12,108,258,10\r
-    EDITTEXT        IDC_COMPARETABLE_DSV_DELIM_CHAR,12,120,30,14,ES_AUTOHSCROLL\r
+    GROUPBOX        "CSV",IDC_STATIC,6,6,270,72\r
+    LTEXT           "File patterns:",IDC_STATIC,12,16,248,10\r
+    COMBOBOX        IDC_COMPARETABLE_CSV_PATTERNS,12,28,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "D&elimiter character:",IDC_STATIC,12,46,258,10\r
+    EDITTEXT        IDC_COMPARETABLE_CSV_DELIM_CHAR,12,58,30,14,ES_AUTOHSCROLL\r
+    GROUPBOX        "TSV",IDC_STATIC,6,80,270,42\r
+    LTEXT           "File patterns:",IDC_STATIC,12,90,258,10\r
+    COMBOBOX        IDC_COMPARETABLE_TSV_PATTERNS,12,102,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    GROUPBOX        "Custom Delimiter-Separated Values",IDC_STATIC,6,124,270,72\r
+    LTEXT           "File patterns:",IDC_STATIC,12,136,258,10\r
+    COMBOBOX        IDC_COMPARETABLE_DSV_PATTERNS,12,148,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+    LTEXT           "D&elimiter character:",IDC_STATIC,12,166,258,10\r
+    EDITTEXT        IDC_COMPARETABLE_DSV_DELIM_CHAR,12,178,30,14,ES_AUTOHSCROLL\r
     CONTROL         "&Allow newlines in quotes",IDC_COMPARETABLE_ALLOWNEWLINE,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,144,270,10\r
-    LTEXT           "&Quote character:",IDC_STATIC,6,156,270,10\r
-    EDITTEXT        IDC_COMPARETABLE_QUOTE_CHAR,6,168,30,14,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,202,270,10\r
+    LTEXT           "&Quote character:",IDC_STATIC,6,214,270,10\r
+    EDITTEXT        IDC_COMPARETABLE_QUOTE_CHAR,6,226,30,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,191,226,88,14\r
 END\r
 \r
 IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 285, 242\r
@@ -2205,7 +2227,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION NC_("Options dialog|Categories", "Binary")\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Binary File &Patterns:",IDC_STATIC,7,6,269,10\r
+    LTEXT           "Binary file &patterns:",IDC_STATIC,7,6,269,10\r
     COMBOBOX        IDC_COMPAREBINARY_PATTERNS,7,18,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
     GROUPBOX        "Frhed settings",IDC_STATIC,7,40,271,88\r
     PUSHBUTTON      "View &Settings...",IDC_COMPAREBINARY_VIEWSETTINGS,17,58,252,14\r
@@ -2219,7 +2241,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Image"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Image File &Patterns:",IDC_STATIC,7,6,269,10\r
+    LTEXT           "Image file &patterns:",IDC_STATIC,7,6,269,10\r
     COMBOBOX        IDC_COMPAREIMAGE_PATTERNS,7,18,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "&Enable image compare in folder compare",IDC_ENABLE_IMGCMP_IN_DIRCMP,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,269,10\r
@@ -2296,6 +2318,7 @@ BEGIN
     EDITTEXT        IDC_ZOOM,178,2,32,14,ES_AUTOHSCROLL,WS_EX_RIGHT\r
     LTEXT           "UA:",-1,214,4,16,10\r
     EDITTEXT        IDC_USERAGENT,230,2,128,14,ES_AUTOHSCROLL\r
+    CONTROL         "View &Differences",IDC_SHOWDIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,362,2,96,14\r
 END\r
 \r
 \r
@@ -2522,6 +2545,9 @@ BEGIN
     0, 0, 50, 0,\r
     50, 0, 0, 0,\r
     0, 0, 0, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 50, 0,\r
+    50, 0, 0, 0,\r
     50, 0, 50, 0,\r
     50, 0, 0, 0,\r
     50, 0, 50, 0,\r
@@ -2605,6 +2631,7 @@ BEGIN
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
+    0, 0, 100, 0,\r
     100, 0, 0, 0\r
 END\r
 \r
@@ -2850,6 +2877,10 @@ BEGIN
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 100, 0,\r
+    0, 0, 100, 0,\r
+    0, 0, 100, 0,\r
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
@@ -2946,6 +2977,7 @@ BEGIN
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
     0, 0, 100, 0,\r
+    0, 0, 100, 0,\r
     0, 0, 100, 0\r
 END\r
 \r
@@ -3933,6 +3965,7 @@ END
 \r
 STRINGTABLE\r
 BEGIN\r
+    IDS_COLORSCHEME_MATLAB  "MATLAB"\r
     IDS_COLORSCHEME_NSIS    "NSIS"\r
     IDS_COLORSCHEME_PASCAL  "Pascal"\r
     IDS_COLORSCHEME_PERL    "Perl"\r
@@ -3980,6 +4013,11 @@ END
 \r
 STRINGTABLE\r
 BEGIN\r
+    IDS_VIEW_WRAP_TEXT      "W&rap Text"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
     IDS_FRHED_NOTINSTALLED  "Frhed is not installed."\r
 END\r
 \r
@@ -4081,10 +4119,16 @@ END
 \r
 STRINGTABLE\r
 BEGIN\r
+    IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 "Only on window activated"\r
+    IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 "Immediately"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
     IDS_PLUGIN_ALL          "Al&l"\r
     IDS_PLUGIN_PROCESS_TYPE1 "Prettification"\r
     IDS_PLUGIN_PROCESS_TYPE2 "Content Extraction"\r
-    IDS_PLUGIN_PROCESS_TYPE3 "Visualization"\r
+    IDS_PLUGIN_PROCESS_TYPE3 "Preview"\r
     IDS_PLUGIN_PROCESS_TYPE4 "Editor script"\r
     IDS_PLUGIN_PROCESS_TYPE5 "Data Query"\r
     IDS_PLUGIN_PROCESS_TYPE6 "Validation"\r
@@ -4112,20 +4156,23 @@ BEGIN
     IDS_PLUGIN_MENU_CAPTION19 "Ignore Comments (C-Family Languages)"\r
     IDS_PLUGIN_MENU_CAPTION20 "Ignore CSV Fields"\r
     IDS_PLUGIN_MENU_CAPTION21 "Ignore TSV Fields"\r
-    IDS_PLUGIN_MENU_CAPTION22 "Apply Prediff Substitution Filters"\r
-    IDS_PLUGIN_MENU_CAPTION23 "Prettify HTML"\r
-    IDS_PLUGIN_MENU_CAPTION24 "Prettify JSON"\r
-    IDS_PLUGIN_MENU_CAPTION25 "Prettify XML"\r
-    IDS_PLUGIN_MENU_CAPTION26 "Prettify YAML"\r
-    IDS_PLUGIN_MENU_CAPTION27 "Visualize Graphviz"\r
-    IDS_PLUGIN_MENU_CAPTION28 "Query CSV Data..."\r
-    IDS_PLUGIN_MENU_CAPTION29 "Query TSV Data..."\r
-    IDS_PLUGIN_MENU_CAPTION30 "Query JSON Data..."\r
-    IDS_PLUGIN_MENU_CAPTION31 "Query YAML Data..."\r
-    IDS_PLUGIN_MENU_CAPTION32 "Validate HTML"\r
-    IDS_PLUGIN_MENU_CAPTION33 "Disassemble JVM Bytecode"\r
-    IDS_PLUGIN_MENU_CAPTION34 "Disassemble IL Code"\r
-    IDS_PLUGIN_MENU_CAPTION35 "Disassemble Native Code"\r
+    IDS_PLUGIN_MENU_CAPTION22 "Ignore Leading Line Numbers"\r
+    IDS_PLUGIN_MENU_CAPTION23 "Apply Prediff Substitution Filters"\r
+    IDS_PLUGIN_MENU_CAPTION24 "Prettify HTML"\r
+    IDS_PLUGIN_MENU_CAPTION25 "Prettify JSON"\r
+    IDS_PLUGIN_MENU_CAPTION26 "Prettify XML"\r
+    IDS_PLUGIN_MENU_CAPTION27 "Prettify YAML"\r
+    IDS_PLUGIN_MENU_CAPTION28 "Preview Graphviz"\r
+    IDS_PLUGIN_MENU_CAPTION29 "Preview Markdown"\r
+    IDS_PLUGIN_MENU_CAPTION30 "Preview PlantUML"\r
+    IDS_PLUGIN_MENU_CAPTION31 "Query CSV Data..."\r
+    IDS_PLUGIN_MENU_CAPTION32 "Query TSV Data..."\r
+    IDS_PLUGIN_MENU_CAPTION33 "Query JSON Data..."\r
+    IDS_PLUGIN_MENU_CAPTION34 "Query YAML Data..."\r
+    IDS_PLUGIN_MENU_CAPTION35 "Validate HTML"\r
+    IDS_PLUGIN_MENU_CAPTION36 "Disassemble JVM Bytecode"\r
+    IDS_PLUGIN_MENU_CAPTION37 "Disassemble IL Code"\r
+    IDS_PLUGIN_MENU_CAPTION38 "Disassemble Native Code"\r
     IDS_PLUGIN_MISSING_PLUGIN_NAME \r
                             "Missing plugin name in plugin pipeline: %1"\r
     IDS_PLUGIN_MISSING_QUOTATION_MARK \r
@@ -4162,41 +4209,45 @@ BEGIN
     IDS_PLUGIN_DESCRIPTION26 \r
                             "YAML Prettier with yq command. \r\nArguments: Filter or command line options passed to the yq command."\r
     IDS_PLUGIN_DESCRIPTION27 \r
-                            "Graphviz Visualizer. \r\nArguments: Command line options passed to the dot command."\r
+                            "Graphviz Previewer. \r\nArguments: Command line options passed to the dot command."\r
     IDS_PLUGIN_DESCRIPTION28 \r
-                            "CSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."\r
+                            "Markdown Previewer. \r\nArguments: Command line options passed to the md2html command."\r
     IDS_PLUGIN_DESCRIPTION29 \r
+                            "PlantUML Previewer. \r\nArguments: Command line options passed to the plantuml.jar command."\r
+    IDS_PLUGIN_DESCRIPTION30\r
+                            "CSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."\r
+    IDS_PLUGIN_DESCRIPTION31\r
                             "TSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."\r
-    IDS_PLUGIN_DESCRIPTION30 \r
+    IDS_PLUGIN_DESCRIPTION32 \r
                             "JSON Querier with jq command. \r\nArguments: Filter or command line options passed to the jq command."\r
-    IDS_PLUGIN_DESCRIPTION31 \r
+    IDS_PLUGIN_DESCRIPTION33 \r
                             "YAML Querier with yq command. \r\nArguments: Filter or command line options passed to the yq command."\r
-    IDS_PLUGIN_DESCRIPTION32 \r
+    IDS_PLUGIN_DESCRIPTION34 \r
                             "HTML Validator with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
-    IDS_PLUGIN_DESCRIPTION33 \r
+    IDS_PLUGIN_DESCRIPTION35 \r
                             "JVM bytecode disassembler with javap. \r\nArguments: Command line options passed to the javap command."\r
-    IDS_PLUGIN_DESCRIPTION34 \r
+    IDS_PLUGIN_DESCRIPTION36 \r
                             "IL disassembler with ildasm. \r\nArguments: Command line options passed to the ildasm command."\r
-    IDS_PLUGIN_DESCRIPTION35 \r
-                            "Native code disassembler with dumpbin. \r\nArguments: Command line options passed to the dumpbin command."\r
     IDS_PLUGIN_DESCRIPTION37 \r
+                            "Native code disassembler with dumpbin. \r\nArguments: Command line options passed to the dumpbin command."\r
+    IDS_PLUGIN_DESCRIPTION38 \r
                             "General content extractor with Apache Tika. \r\nArguments: Command line options passed to the tika-app.jar."\r
-    IDS_PLUGIN_DESCRIPTION38 "Apply patch using GnuWin32 Patch for Windows"\r
-    IDS_PLUGIN_DESCRIPTION39 "Display the text content of MS Excel files"\r
-    IDS_PLUGIN_DESCRIPTION40 "Display the text content of MS PowerPoint files"\r
-    IDS_PLUGIN_DESCRIPTION41 "Display the text content of MS Visio files"\r
-    IDS_PLUGIN_DESCRIPTION42 "Display the text content of MS Word files"\r
-    IDS_PLUGIN_DESCRIPTION43 \r
-                            "Ignore some columns - ignored columns list from the plugin name or the plugin argument"\r
+    IDS_PLUGIN_DESCRIPTION39 "Apply patch using GnuWin32 Patch for Windows"\r
+    IDS_PLUGIN_DESCRIPTION40 "Display the text content of MS Excel files"\r
+    IDS_PLUGIN_DESCRIPTION41 "Display the text content of MS PowerPoint files"\r
+    IDS_PLUGIN_DESCRIPTION42 "Display the text content of MS Visio files"\r
+    IDS_PLUGIN_DESCRIPTION43 "Display the text content of MS Word files"\r
     IDS_PLUGIN_DESCRIPTION44 \r
-                            "The plugin ignores comments (//... and /* ... */) in C, C++, PHP and JavaScript files."\r
+                            "Ignore some columns - ignored columns list from the plugin name or the plugin argument"\r
     IDS_PLUGIN_DESCRIPTION45 \r
+                            "The plugin ignores comments (//... and /* ... */) in C, C++, PHP and JavaScript files."\r
+    IDS_PLUGIN_DESCRIPTION46 \r
                             "Ignore some fields - ignored fields list from the plugin name or the plugin argument"\r
-    IDS_PLUGIN_DESCRIPTION46 "Prediff Line Filter"\r
-    IDS_PLUGIN_DESCRIPTION47 "Basic text functions for the context menu"\r
-    IDS_PLUGIN_DESCRIPTION48 \r
-                            "HTTP URL Scheme Handler with curl. \r\nArguments: Command line options passed to the curl command."\r
+    IDS_PLUGIN_DESCRIPTION47 "Prediff Line Filter"\r
+    IDS_PLUGIN_DESCRIPTION48 "Basic text functions for the context menu"\r
     IDS_PLUGIN_DESCRIPTION49 \r
+                            "HTTP URL Scheme Handler with curl. \r\nArguments: Command line options passed to the curl command."\r
+    IDS_PLUGIN_DESCRIPTION50 \r
                             "Windows Registry URL Scheme Handler. \r\nArguments: Command line options passed to the reg.exe command."\r
 END\r
 \r