MENUITEM "Copy &from Left", ID_COPY_FROM_LEFT\r
MENUITEM "Copy fro&m Right", ID_COPY_FROM_RIGHT\r
MENUITEM SEPARATOR\r
+ MENUITEM "Copy Selected Line(s) to Right", ID_LINES_L2R\r
+ MENUITEM "Copy Selected Line(s) to Left", ID_LINES_R2L\r
+ MENUITEM "Copy Selected Line(s) from Left", ID_COPY_LINES_FROM_LEFT\r
+ MENUITEM "Copy Selected Line(s) from Right", ID_COPY_LINES_FROM_RIGHT\r
+ MENUITEM SEPARATOR\r
MENUITEM "&Select Line Difference\tF4", ID_SELECTLINEDIFF\r
- MENUITEM "Add this change to &Ignored Substitutions", ID_ADD_TO_IGNORED_SUBSTITUTIONS\r
+ MENUITEM "Add this change to Substitution &Filters", ID_ADD_TO_IGNORED_SUBSTITUTIONS\r
MENUITEM SEPARATOR\r
MENUITEM "&Undo", ID_EDIT_UNDO\r
MENUITEM "&Redo", ID_EDIT_REDO\r
MENUITEM "With &Registered Application", ID_FILE_OPEN_REGISTERED\r
MENUITEM "With &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR\r
MENUITEM "&With...", ID_FILE_OPEN_WITH\r
+ MENUITEM "Open &Parent Folder...", ID_FILE_OPEN_PARENT_FOLDER\r
END\r
MENUITEM "S&hell Menu", ID_FILE_SHELLMENU\r
END\r
MENUITEM "&50%", ID_IMG_VECTORIMAGESCALING_50\r
MENUITEM "25%", ID_IMG_VECTORIMAGESCALING_25\r
END\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "Compare Extracted &Text From Image", ID_IMG_COMPARE_EXTRACTED_TEXT\r
END\r
END\r
\r
MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY\r
END\r
MENUITEM SEPARATOR\r
- MENUITEM "File En&coding...", ID_FILE_ENCODING\r
+ MENUITEM "&File Encoding...", ID_FILE_ENCODING\r
MENUITEM SEPARATOR\r
POPUP "Recent F&iles Or Folders"\r
BEGIN\r
MENUITEM SEPARATOR\r
MENUITEM "Com&pare Statistics...", ID_VIEW_DIR_STATISTICS\r
MENUITEM SEPARATOR\r
- MENUITEM "Refre&sh\tF5", ID_REFRESH\r
+ MENUITEM "Refresh\tF5", ID_REFRESH\r
MENUITEM "&Refresh Selected\tCtrl+F5", ID_RESCAN\r
END\r
POPUP "&Merge"\r
BEGIN\r
MENUITEM "&Text", ID_MERGE_COMPARE_TEXT\r
MENUITEM "T&able", ID_MERGE_COMPARE_TABLE\r
- MENUITEM "&XML", ID_MERGE_COMPARE_XML\r
MENUITEM "&Binary", ID_MERGE_COMPARE_HEX\r
MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE\r
+ MENUITEM "&XML", ID_MERGE_COMPARE_XML\r
END\r
MENUITEM SEPARATOR\r
POPUP "Recent F&iles Or Folders"\r
MENUITEM "Diff &Pane", ID_VIEW_DETAIL_BAR\r
MENUITEM "Lo&cation Pane", ID_VIEW_LOCATION_BAR\r
MENUITEM SEPARATOR\r
- MENUITEM "Refre&sh\tF5", ID_REFRESH\r
+ MENUITEM "Refresh\tF5", ID_REFRESH\r
END\r
POPUP "&Merge"\r
BEGIN\r
END\r
POPUP "Co&mpare As"\r
BEGIN\r
- MENUITEM "&XML", ID_MERGE_COMPARE_XML\r
+ MENUITEM "&Text", ID_MERGE_COMPARE_TEXT\r
+ MENUITEM "T&able", ID_MERGE_COMPARE_TABLE\r
MENUITEM "&Binary", ID_MERGE_COMPARE_HEX\r
MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE\r
+ MENUITEM "&XML", ID_MERGE_COMPARE_XML\r
END\r
MENUITEM SEPARATOR\r
POPUP "&Copy"\r
POPUP "&Open Left"\r
BEGIN\r
MENUITEM "With &Registered Application", ID_DIR_OPEN_LEFT\r
- MENUITEM "with &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR\r
+ MENUITEM "With &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR\r
MENUITEM "&With...", ID_DIR_OPEN_LEFT_WITH\r
MENUITEM "Open &Parent Folder...", ID_DIR_OPEN_LEFT_PARENT_FOLDER\r
END\r
POPUP "Open Midd&le"\r
BEGIN\r
MENUITEM "With &Registered Application", ID_DIR_OPEN_MIDDLE\r
- MENUITEM "with &External Editor", ID_DIR_OPEN_MIDDLE_WITHEDITOR\r
+ MENUITEM "With &External Editor", ID_DIR_OPEN_MIDDLE_WITHEDITOR\r
MENUITEM "&With...", ID_DIR_OPEN_MIDDLE_WITH\r
MENUITEM "Open &Parent Folder...", ID_DIR_OPEN_MIDDLE_PARENT_FOLDER\r
END\r
POPUP "O&pen Right"\r
BEGIN\r
MENUITEM "With &Registered Application", ID_DIR_OPEN_RIGHT\r
- MENUITEM "with &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR\r
+ MENUITEM "With &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR\r
MENUITEM "&With...", ID_DIR_OPEN_RIGHT_WITH\r
MENUITEM "Open &Parent Folder...", ID_DIR_OPEN_RIGHT_PARENT_FOLDER\r
END\r
MENUITEM "Left Shell menu", ID_DIR_SHELL_CONTEXT_MENU_LEFT\r
MENUITEM "Middle Shell menu", ID_DIR_SHELL_CONTEXT_MENU_MIDDLE\r
MENUITEM "Right Shell menu", ID_DIR_SHELL_CONTEXT_MENU_RIGHT\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "&File Encoding...", ID_FILE_ENCODING\r
END\r
POPUP "_HDR_POPUP_"\r
BEGIN\r
END\r
END\r
\r
+IDR_POPUP_COMPARE MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "&Text", ID_MERGE_COMPARE_TEXT\r
+ MENUITEM "T&able", ID_MERGE_COMPARE_TABLE\r
+ MENUITEM "&Binary", ID_MERGE_COMPARE_HEX\r
+ MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE\r
+ END\r
+END\r
+\r
+IDR_POPUP_OPEN MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "< Empty >", ID_NO_MRU\r
+ END\r
+END\r
+\r
IDR_POPUP_PROJECT MENU\r
BEGIN\r
POPUP "_POPUP_"\r
END\r
END\r
\r
+IDR_POPUP_SAVE MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "Save &Left", ID_FILE_SAVE_LEFT\r
+ MENUITEM "Save &Middle", ID_FILE_SAVE_MIDDLE\r
+ MENUITEM "Save &Right", ID_FILE_SAVE_RIGHT\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "Save &Left As...", ID_FILE_SAVEAS_LEFT\r
+ MENUITEM "Save &Middle As...", ID_FILE_SAVEAS_MIDDLE\r
+ MENUITEM "Save &Right As...", ID_FILE_SAVEAS_RIGHT\r
+ END\r
+END\r
+\r
IDR_POPUP_MERGEEDITFRAME_STATUSBAR_EOL MENU\r
BEGIN\r
POPUP "_POPUP_"\r
VK_DOWN, ID_NEXTCONFLICT, VIRTKEY, SHIFT, ALT, NOINVERT\r
VK_F8, ID_NEXTDIFF, VIRTKEY, NOINVERT\r
VK_F8, ID_NEXTCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
+ VK_F8, ID_NEXTFILE, VIRTKEY, CONTROL, NOINVERT\r
VK_F7, ID_PREVDIFF, VIRTKEY, NOINVERT\r
VK_F7, ID_PREVCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
+ VK_F7, ID_PREVFILE, VIRTKEY, CONTROL, NOINVERT\r
VK_END, ID_LASTDIFF, VIRTKEY, ALT, NOINVERT\r
VK_F2, ID_DIR_ITEM_RENAME, VIRTKEY, NOINVERT\r
VK_F3, ID_EDIT_REPEAT, VIRTKEY, SHIFT, NOINVERT\r
PUSHBUTTON "Se&lect...",IDC_SELECT_UNPACKER,383,209,73,14\r
\r
CONTROL "Sa&ve Project...",ID_SAVE_PROJECT,"Button",BS_SPLITBUTTON | WS_TABSTOP,10,245,100,14\r
- DEFPUSHBUTTON "Co&mpare",IDOK,316,245,70,20\r
+ CONTROL "Co&mpare",IDOK,"Button",BS_SPLITBUTTON | WS_TABSTOP,316,245,70,20\r
PUSHBUTTON "Cancel",IDCANCEL,390,245,70,20\r
LTEXT "Status:",IDC_OPEN_STATUS,6,272,440,12\r
\r
COMBOBOX IDC_ESC_CLOSES_WINDOW,7,39,240,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
CONTROL "&Automatically verify paths in Open-dialog",IDC_VERIFY_OPEN_PATHS,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,56,240,10\r
- CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,68,240,10\r
+ LTEXT "Single instance mode:",IDC_STATIC,7,67,240,10\r
+ COMBOBOX IDC_SINGLE_INSTANCE,7,78,240,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
CONTROL "As&k when closing multiple windows",IDC_ASK_MULTIWINDOW_CLOSE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,80,240,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,240,10\r
CONTROL "&Preserve file time in file compare",IDC_PRESERVE_FILETIME,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,92,240,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,240,10\r
CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,104,240,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,240,10\r
CONTROL "Close ""Select Files or Folders"" Dialog on clicking OK button",IDC_CLOSE_WITH_OK,\r
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,116,240,10\r
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,7,132,240,10\r
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,144,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "Language:",IDC_STATIC,7,162,240,10\r
- COMBOBOX IDC_LANGUAGE_LIST,7,174,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again.",IDC_STATIC,7,194,240,30\r
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,131,240,10\r
+ LTEXT "Op&en-dialog Auto-Completion:",IDC_STATIC,7,145,240,10\r
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,159,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Language:",IDC_STATIC,7,175,240,10\r
+ COMBOBOX IDC_LANGUAGE_LIST,7,187,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again.",IDC_STATIC,7,207,240,30\r
PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,161,228,88,14,NOT WS_TABSTOP\r
END\r
\r
-IDD_EDIT_FIND DIALOGEX 30, 73, 305, 96\r
+IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Find"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Fi&nd what:",IDC_STATIC,7,9,60,10\r
- COMBOBOX IDC_EDIT_FINDTEXT,69,7,150,65,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Fi&nd what:",IDC_STATIC,7,9,70,10\r
+ COMBOBOX IDC_EDIT_FINDTEXT,80,7,160,65,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,24,140,10\r
CONTROL "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,140,10\r
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,140,10\r
CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,200,10\r
CONTROL "&Don't close this dialog box",IDC_FINDDLG_DONTCLOSE,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,200,10\r
- DEFPUSHBUTTON "&Find Next",IDOK,226,7,72,14,WS_GROUP\r
- PUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,226,24,72,14,WS_GROUP\r
- PUSHBUTTON "Cancel",IDCANCEL,226,41,72,14\r
+ DEFPUSHBUTTON "&Find Next",IDOK,247,7,70,14,WS_GROUP\r
+ PUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,247,24,70,14,WS_GROUP\r
+ PUSHBUTTON "Cancel",IDCANCEL,247,41,70,14\r
END\r
\r
IDD_DIR_FILTER DIALOGEX 30, 73, 293, 74\r
CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,140,10\r
CONTROL "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,140,10\r
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,140,10\r
- DEFPUSHBUTTON "&OK",IDOK,226,7,60,14,WS_GROUP\r
+ DEFPUSHBUTTON "&Ok",IDOK,226,7,60,14,WS_GROUP\r
PUSHBUTTON "Cancel",IDCANCEL,226,24,60,14\r
END\r
\r
PUSHBUTTON "Cancel",IDCANCEL,240,154,50,14\r
END\r
\r
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 531, 284\r
+IDD_FILTERS_LINEFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
CAPTION "Line Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "Enable Line Filters",IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,351,15\r
LTEXT "Regular Expressions (one per line):",IDC_STATIC,7,24,351,10\r
- CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,39,516,219\r
- PUSHBUTTON "New",IDC_LFILTER_ADDBTN,6,264,50,14\r
- PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,61,264,50,14\r
- PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,115,264,50,14\r
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,39,516,111\r
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,6,156,50,14\r
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,61,156,50,14\r
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,115,156,50,14\r
END\r
\r
-IDD_IGNORED_SUSBSTITUTIONS_DLG DIALOGEX 0, 0, 531, 284\r
+IDD_FILTERS_SUBSTITUTIONFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Ignored Substitutions"\r
+CAPTION "Substitution Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
LTEXT "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected.",IDC_STATIC,8,6,516,19\r
- CONTROL "Enable",IDC_IGNORED_SUSBSTITUTIONS_ARE_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,28,351,9\r
- CONTROL "",IDC_IGNORED_SUBSTITUTIONS_FILTER,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,87,516,171\r
- CONTROL "Completely unhighlight the ignored changes",IDC_COMPLETELY_BLANK_OUT_IGNORED_SUBSTITUTIONS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,43,341,10\r
- CONTROL "Ignore changes in both directions",IDC_IGNORED_SUSBSTITUTIONS_WORK_BOTH_WAYS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,57,351,10\r
- CONTROL "Use regular expressions",IDC_USE_REGEXPS_FOR_IGNORED_SUBSTITUTIONS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,350,10\r
- PUSHBUTTON "Add",IDC_LFILTER_ADDBTN,7,264,50,14\r
- PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,63,264,50,14\r
- PUSHBUTTON "Clear",IDC_LFILTER_CLEARBTN,474,264,50,14\r
-END\r
-\r
-IDD_IGNORED_SUSBSTITUTIONS_DLG DIALOGEX 0, 0, 365, 281\r
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Ignored Substitutions"\r
-FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
-BEGIN\r
- CONTROL "Enable",IDC_IGNORED_SUSBSTITUTIONS_ARE_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,28,351,9\r
- CONTROL "",IDC_IGNORED_SUBSTITUTIONS_FILTER,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,87,350,166\r
- PUSHBUTTON "Add",IDC_LFILTER_ADDBTN,7,260,50,14\r
- PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,63,260,50,14\r
- LTEXT "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected.",IDC_STATIC,8,6,346,19\r
- CONTROL "Ignore changes in both directions",IDC_IGNORED_SUSBSTITUTIONS_WORK_BOTH_WAYS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,57,351,10\r
- CONTROL "Completely unhighlight the ignored changes",IDC_COMPLETELY_BLANK_OUT_IGNORED_SUBSTITUTIONS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,43,341,10\r
- CONTROL "Use regular expressions",IDC_USE_REGEXPS_FOR_IGNORED_SUBSTITUTIONS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,350,10\r
- PUSHBUTTON "Clear",IDC_LFILTER_CLEARBTN,307,261,50,14\r
+ CONTROL "Enable",IDC_IGNORED_SUSBSTITUTIONS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,28,351,9\r
+ CONTROL "",IDC_SUBSTITUTION_FILTERS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,40,516,111\r
+ PUSHBUTTON "Add",IDC_LFILTER_ADDBTN,7,156,50,14\r
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,63,156,50,14\r
+ PUSHBUTTON "Clear",IDC_LFILTER_CLEARBTN,474,156,50,14\r
END\r
\r
IDD_PROPPAGE_COLOR_SCHEMES DIALOGEX 0, 0, 255, 242\r
PUSHBUTTON "Cancel",IDCANCEL,275,143,50,14\r
END\r
\r
-IDD_SELECTUNPACKER DIALOGEX 0, 0, 318, 102\r
+IDD_PLUGINS_SELECTUNPACKER DIALOGEX 0, 0, 318, 102\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Select Unpacker"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,132,239,10\r
LTEXT "Diff &algorithm (Experimental):",IDC_STATIC,7,144,239,10\r
COMBOBOX IDC_DIFF_ALGORITHM,6,156,240,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- CONTROL "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,174,239,10\r
+ CONTROL "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,239,10\r
+ CONTROL "Completely unhighlight the ignored differences",IDC_COMPLETELY_BLANK_OUT_IGNORED_DIFFERENCES,\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,186,239,10\r
PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,161,228,88,14\r
END\r
\r
COMBOBOX IDC_RENDERING_MODE,6,226,240,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
END\r
\r
+IDD_PROPPAGE_EDITOR_SYNTAX DIALOGEX 0, 0, 255, 242\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ CONTROL "",IDC_SYNTAX_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 7, 241, 215\r
+ PUSHBUTTON "Defaults", IDC_COMPARE_DEFAULTS, 161, 228, 88, 14\r
+END\r
+\r
IDD_MESSAGE_BOX DIALOGEX 0, 0, 186, 95\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
END\r
\r
-IDD_FILEFILTERS DIALOGEX 0, 0, 531, 284\r
+IDD_FILTERS_FILEFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "File Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- CONTROL "",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,6,516,252\r
- PUSHBUTTON "Test...",IDC_FILTERFILE_TEST_BTN,6,264,50,14\r
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,305,264,50,14\r
- PUSHBUTTON "New...",IDC_FILTERFILE_NEWBTN,360,264,50,14\r
- PUSHBUTTON "Edit...",IDC_FILTERFILE_EDITBTN,414,264,50,14\r
- PUSHBUTTON "Delete...",IDC_FILTERFILE_DELETEBTN,473,264,50,14\r
+ CONTROL "",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,6,516,144\r
+ PUSHBUTTON "Test...",IDC_FILTERFILE_TEST_BTN,6,156,50,14\r
+ PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,305,156,50,14\r
+ PUSHBUTTON "New...",IDC_FILTERFILE_NEWBTN,360,156,50,14\r
+ PUSHBUTTON "Edit...",IDC_FILTERFILE_EDITBTN,414,156,50,14\r
+ PUSHBUTTON "Delete...",IDC_FILTERFILE_DELETEBTN,473,156,50,14\r
END\r
\r
IDD_SAVECLOSING DIALOGEX 0, 0, 262, 217\r
BEGIN\r
GROUPBOX "Default Codepage",IDC_STATIC,7,7,241,93\r
LTEXT "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,228,20\r
- CONTROL "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session.",IDC_DETECT_CODEPAGE,\r
+ CONTROL "Detect codepage info for these type of files: .html, .rc, .xml\nNeed to restart session.",IDC_DETECT_CODEPAGE,\r
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,105,230,30\r
- CONTROL "Detect codepage for text files using mlang.dll\nNeed to restart session.",IDC_DETECT_CODEPAGE2,\r
+ CONTROL "Detect codepage for text files with mlang.dll\nNeed to restart session.",IDC_DETECT_CODEPAGE2,\r
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,139,230,34\r
COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,175,217,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
CONTROL "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,230,10\r
PUSHBUTTON "Cancel",IDCANCEL,211,76,50,14\r
END\r
\r
-IDD_SHARED_FILTER DIALOGEX 0, 0, 250, 75\r
+IDD_FILTERS_FILEFILTERS_SHARED DIALOGEX 0, 0, 250, 75\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Shared or Private Filter"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Cancel",IDCANCEL,135,55,50,14\r
END\r
\r
-IDD_PROP_ARCHIVE DIALOGEX 0, 0, 255, 126\r
+IDD_PROPPAGE_ARCHIVE DIALOGEX 0, 0, 255, 126\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Archive Support"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
DEFPUSHBUTTON "Close",IDOK,200,193,50,14\r
END\r
\r
-IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 278, 150\r
+IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 278, 163\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Codepage"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
LTEXT "(Affects)",IDC_MIDDLE_FILES_LABEL,70,29,193,10\r
CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,40,54,10\r
LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,40,193,10\r
- GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,59,266,63\r
+ GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,59,266,76\r
LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,75,172,10\r
COMBOBOX IDC_LOAD_CODEPAGE_TEXTBOX,86,74,165,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,90,67,10\r
COMBOBOX IDC_SAVE_CODEPAGE_TEXTBOX,86,90,165,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
+ CONTROL "&BOM",IDC_SAVE_CODEPAGE_BOM,\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,107,165,10\r
CONTROL "&Use same codepage for both",IDC_LOAD_SAVE_SAME_CODEPAGE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,107,250,10\r
- DEFPUSHBUTTON "&Ok",IDOK,165,128,50,14\r
- PUSHBUTTON "&Cancel",IDCANCEL,221,128,50,14\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,250,10\r
+ DEFPUSHBUTTON "&Ok",IDOK,165,141,50,14\r
+ PUSHBUTTON "&Cancel",IDCANCEL,221,141,50,14\r
END\r
\r
-IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142\r
+IDD_FILTERS_FILEFILTERS_TEST DIALOGEX 0, 0, 249, 142\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Test Filter"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
END\r
\r
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 115\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
CAPTION "Confirm Copy"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL | ES_READONLY\r
LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,10\r
EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL | ES_READONLY\r
- CONTROL "Don't ask this &question again.",IDC_FLDCONFIRM_DONTASKAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,81,232,10\r
+ CONTROL "Don't ask this &question again.",IDC_FLDCONFIRM_DONTASKAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,81,232,10\r
DEFPUSHBUTTON "Yes",IDYES,174,95,50,14\r
PUSHBUTTON "No",IDNO,228,95,50,14\r
END\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,36,239,10\r
CONTROL "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,48,239,10\r
- CONTROL "&Include unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
+ CONTROL "Include &unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,60,239,10\r
CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,72,239,10\r
CONTROL "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,\r
COMBOBOX IDC_COMPAREIMAGE_PATTERNS,7,18,240,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,239,10\r
+ LTEXT "OCR result:",IDC_STATIC,7,46,239,10\r
+ COMBOBOX IDC_COMPAREIMAGE_OCR_RESULT_TYPE,7,58,239,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,161,228,88,14\r
END\r
\r
BEGIN\r
END\r
\r
- IDD_PROPPAGE_FILTER, DIALOG\r
+ IDD_FILTERS_LINEFILTERS, DIALOG\r
BEGIN\r
END\r
\r
- IDD_IGNORED_SUSBSTITUTIONS_DLG, DIALOG\r
+ IDD_FILTERS_SUBSTITUTIONFILTERS, DIALOG\r
BEGIN\r
BOTTOMMARGIN, 196\r
END\r
BEGIN\r
END\r
\r
- IDD_FILEFILTERS, DIALOG\r
+ IDD_PROPPAGE_EDITOR_SYNTAX, DIALOG\r
+ BEGIN\r
+ END\r
+\r
+ IDD_FILTERS_FILEFILTERS, DIALOG\r
BEGIN\r
END\r
\r
BEGIN\r
END\r
\r
- IDD_PROP_ARCHIVE, DIALOG\r
+ IDD_PROPPAGE_ARCHIVE, DIALOG\r
BEGIN\r
END\r
\r
0, 0, 100, 0,\r
0, 0, 0, 0,\r
0, 0, 100, 0,\r
+ 0, 0, 0, 0\r
100, 0, 0, 0,\r
100, 0, 0, 0,\r
- 0, 0, 0, 0\r
END\r
\r
IDD_DIALOG_WINDOWSMANAGER AFX_DIALOG_LAYOUT\r
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
-IDD_PROP_ARCHIVE AFX_DIALOG_LAYOUT\r
+IDD_PROPPAGE_ARCHIVE AFX_DIALOG_LAYOUT\r
BEGIN\r
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
100, 0, 0, 0\r
END\r
\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
100, 0, 0, 0\r
END\r
\r
0, 0, 100, 0\r
END\r
\r
+IDD_PROPPAGE_EDITOR_SYNTAX AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0,\r
+ 0, 0, 100, 0,\r
+ 100, 0, 0, 0\r
+END\r
+\r
IDD_PROPPAGE_SYSTEM AFX_DIALOG_LAYOUT\r
BEGIN\r
0,\r
0, 0, 100, 0\r
END\r
\r
-IDD_FILEFILTERS AFX_DIALOG_LAYOUT\r
+IDD_FILTERS_FILEFILTERS AFX_DIALOG_LAYOUT\r
BEGIN\r
0\r
END\r
\r
-IDD_PROPPAGE_FILTER AFX_DIALOG_LAYOUT\r
+IDD_FILTERS_LINEFILTERS AFX_DIALOG_LAYOUT\r
BEGIN\r
0\r
END\r
// SPLASH SCREEN TEXTS\r
STRINGTABLE\r
BEGIN\r
- IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"\r
IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."\r
END\r
\r
IDS_OPTIONSPG_GENERAL "General"\r
IDS_OPTIONSPG_COMPARE "Compare"\r
IDS_OPTIONSPG_EDITOR "Editor"\r
+ IDS_OPTIONSPG_GENEDITOR "General"\r
+ IDS_OPTIONSPG_EDITOR_SYNTAX "Syntax"\r
IDS_OPTIONSPG_COLORS "Colors"\r
IDS_OPTIONSPG_COLOR_SCHEMES "Color Schemes"\r
IDS_OPTIONSPG_TEXTCOLORS "Text"\r
IDS_COMPMETHOD_SIZE "Size"\r
END\r
\r
+// EDITOR OPTIONS\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_SYNTAXTABLE_FILETYPE "File Type"\r
+ IDS_SYNTAXTABLE_EXTENSION "Extension"\r
+END\r
+\r
// FILTER OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_CONFLICT_BASE_FILE "Base File"\r
IDS_CONFLICT_THEIRS_FILE "Theirs File"\r
IDS_CONFLICT_MINE_FILE "Mine File"\r
+ IDS_SELFCOMPARE_ORIGINAL_FILE "Original File"\r
END\r
\r
// STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)\r
"Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"\r
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"\r
IDS_LINE_STATUS_INFO "Ln: %s Col: %d/%d Ch: %d/%d"\r
+ IDS_LINE_STATUS_INFO_SEL " Sel: %d | %d"\r
IDS_MERGEMODE_MERGING "Merge"\r
IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"\r
IDS_NO_DIFF_SEL_FMT "%1 Differences Found"\r
IDS_MOVE_TO_PREVFILE "Do you want to move to the previous file?"\r
IDS_MOVE_TO_NEXTPAGE "Do you want to move to the next page?"\r
IDS_MOVE_TO_PREVPAGE "Do you want to move to the previous page?"\r
+ IDS_MOVE_TO_FIRSTFILE "Do you want to move to the first file?"\r
+ IDS_MOVE_TO_LASTFILE "Do you want to move to the last file?"\r
END\r
\r
// Encoding issues\r
ID_ALL_RIGHT "\nAll Right"\r
ID_ALL_LEFT "\nAll Left"\r
ID_AUTO_MERGE "\nAuto Merge (Ctrl+Alt+M)"\r
+ ID_FIRSTFILE "\nFirst File"\r
+ ID_NEXTFILE "\nNext File (Ctrl+F8)"\r
+ ID_LASTFILE "\nLast File"\r
+ ID_PREVFILE "\nPrevious File (Ctrl+F7)"\r
+\r
END\r
\r
// PLUGINS MENU\r
IDS_COLORSCHEME_INSTALLSHIELD "InstallShield"\r
IDS_COLORSCHEME_JAVA "Java"\r
IDS_COLORSCHEME_JAVASCRIPT "JavaScript"\r
+ IDS_COLORSCHEME_JSON "JSON"\r
IDS_COLORSCHEME_LISP "AutoLISP"\r
IDS_COLORSCHEME_LUA "Lua"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_IGNSUB_STR1 "On one panel"\r
- IDS_IGNSUB_STR2 "On the other panel"\r
- IDS_IGNSUB_STR3 "<Edit here>"\r
- IDS_IGNSUB_STR4 "No differences to select found"\r
- IDS_IGNSUB_STR5 "No differences found to add as ignored substitution"\r
- IDS_IGNSUB_STR6 "The pair is already present in the list of Ignored Substiturions"\r
- IDS_IGNSUB_STR7 "Add this change to Ignored Substitutions?"\r
+ IDS_IGNSUB_STR1 "<Edit here>"\r
+ IDS_IGNSUB_STR2 "No differences to select found"\r
+ IDS_IGNSUB_STR3 "No differences found to add as substitution filter"\r
+ IDS_IGNSUB_STR4 "The pair is already present in the list of Substitution Filters"\r
+ IDS_IGNSUB_STR5 "Add this change to Substitution Filters?"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_OCRRESULT_TEXTONLY "Text only"\r
+ IDS_OCRRESULT_POS_LINE "Line-by-line position and text"\r
+ IDS_OCRRESULT_POS_WORD "Word-by-word position and text"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_SINGLEINSTANCE_STR1 "Allow only one instance to run"\r
+ IDS_SINGLEINSTANCE_STR2 "Allow only one instance to run and wait for the instance to terminate"\r
END\r
\r
#endif // English (United States) resources\r
OSDN Git Service
