BEGIN\r
POPUP "_POPUP_"\r
BEGIN\r
- MENUITEM "C&opy to Right", ID_L2R\r
- MENUITEM "Cop&y to Left", ID_R2L\r
- MENUITEM "Copy &from Left", ID_COPY_FROM_LEFT\r
- MENUITEM "Copy fro&m Right", ID_COPY_FROM_RIGHT\r
+ MENUITEM "Copy to Middle", ID_COPY_TO_MIDDLE_L\r
+ MENUITEM "C&opy to Right\tAlt+Right", ID_COPY_TO_RIGHT_L\r
+ MENUITEM "Copy from Middle", ID_COPY_FROM_MIDDLE_L\r
+ MENUITEM "Copy fro&m Right\tAlt+Shift+Left", ID_COPY_FROM_RIGHT_L\r
+ MENUITEM "Cop&y to Left\tAlt+Left", ID_COPY_TO_LEFT_M\r
+ MENUITEM "C&opy to Right\tAlt+Right", ID_COPY_TO_RIGHT_M\r
+ MENUITEM "Copy &from Left\tAlt+Shift+Right", ID_COPY_FROM_LEFT_M\r
+ MENUITEM "Copy fro&m Right\tAlt+Shift+Left", ID_COPY_FROM_RIGHT_M\r
+ MENUITEM "Copy to Middle", ID_COPY_TO_MIDDLE_R\r
+ MENUITEM "Cop&y to Left\tAlt+Left", ID_COPY_TO_LEFT_R\r
+ MENUITEM "Copy from Middle", ID_COPY_FROM_MIDDLE_R\r
+ MENUITEM "Copy &from Left\tAlt+Shift+Right", ID_COPY_FROM_LEFT_R\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 "Copy Selected Line(s) to Middle", ID_COPY_LINES_TO_MIDDLE_L\r
+ MENUITEM "Copy Selected Line(s) to Right", ID_COPY_LINES_TO_RIGHT_L\r
+ MENUITEM "Copy Selected Line(s) from Middle", ID_COPY_LINES_FROM_MIDDLE_L\r
+ MENUITEM "Copy Selected Line(s) from Right", ID_COPY_LINES_FROM_RIGHT_L\r
+ MENUITEM "Copy Selected Line(s) to Left", ID_COPY_LINES_TO_LEFT_M\r
+ MENUITEM "Copy Selected Line(s) to Right", ID_COPY_LINES_TO_RIGHT_M\r
+ MENUITEM "Copy Selected Line(s) from Left", ID_COPY_LINES_FROM_LEFT_M\r
+ MENUITEM "Copy Selected Line(s) from Right", ID_COPY_LINES_FROM_RIGHT_M\r
+ MENUITEM "Copy Selected Line(s) to Middle", ID_COPY_LINES_TO_MIDDLE_R\r
+ MENUITEM "Copy Selected Line(s) to Left", ID_COPY_LINES_TO_LEFT_R\r
+ MENUITEM "Copy Selected Line(s) from Middle", ID_COPY_LINES_FROM_MIDDLE_R\r
+ MENUITEM "Copy Selected Line(s) from Left", ID_COPY_LINES_FROM_LEFT_R\r
MENUITEM SEPARATOR\r
- MENUITEM "&Select Line Difference\tF4", ID_SELECTLINEDIFF\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
MENUITEM "&Copy", ID_EDIT_COPY\r
MENUITEM "&Paste", ID_EDIT_PASTE\r
MENUITEM SEPARATOR\r
+ POPUP "&Scripts"\r
+ BEGIN\r
+ MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS\r
+ END\r
+ MENUITEM SEPARATOR\r
MENUITEM "&Go to...\tCtrl+G", ID_EDIT_WMGOTO\r
MENUITEM "Go to Moved Line Between Left and Middle\tCtrl+Shift+G", ID_GOTO_MOVED_LINE_LM\r
- MENUITEM "Go to Moved Line Between Middle and Right\tCtrl+Alt+G", ID_GOTO_MOVED_LINE_MR\r
+ MENUITEM "Go to Moved Line Between Middle and Right\tCtrl+Alt+G", ID_GOTO_MOVED_LINE_MR\r
MENUITEM SEPARATOR\r
POPUP "Op&en"\r
BEGIN\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
END\r
\r
+IDR_POPUP_MERGEVIEWHEADER MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "Use First Line as Headers", ID_USE_FIRST_LINE_AS_HEADERS\r
+ MENUITEM "Auto-Fit All Columns", ID_AUTO_FIT_ALL_COLUMNS\r
+ END\r
+END\r
+\r
IDR_POPUP_IMGMERGEVIEW MENU\r
BEGIN\r
POPUP "_POPUP_"\r
MENUITEM "&Next Page", ID_IMG_NEXTPAGE\r
POPUP "&Active Pane"\r
BEGIN\r
+ MENUITEM "Rotate &Right 90deg", ID_IMG_CURPANE_ROTATE_RIGHT_90\r
+ MENUITEM "Rotate &Left 90deg", ID_IMG_CURPANE_ROTATE_LEFT_90\r
+ MENUITEM "Flip V&ertically", ID_IMG_CURPANE_FLIP_VERTICALLY\r
+ MENUITEM "Flip H&orizontally", ID_IMG_CURPANE_FLIP_HORIZONTALLY\r
MENUITEM "&Previous Page", ID_IMG_CURPANE_PREVPAGE\r
MENUITEM "&Next Page", ID_IMG_CURPANE_NEXTPAGE\r
END\r
MENUITEM "&Adjust Offset", ID_IMG_DRAGGINGMODE_ADJUST_OFFSET\r
MENUITEM "&Vertical Wipe", ID_IMG_DRAGGINGMODE_VERTICAL_WIPE\r
MENUITEM "&Horizontal Wipe", ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE\r
- MENUITEM "&Rectangle Select", ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT\r
+ MENUITEM "Rectangle &Select", ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT\r
END\r
MENUITEM "&Set Background Color", ID_IMG_USEBACKCOLOR\r
POPUP "&Vector Image Scaling"\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
+ MENUITEM "Compare Extracted &Text From Images", ID_IMG_COMPARE_EXTRACTED_TEXT\r
+ END\r
+END\r
+\r
+IDR_POPUP_WEBPAGEDIFFVIEW MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ POPUP "Co&mpare"\r
+ BEGIN\r
+ MENUITEM "&Screenshots", ID_WEB_COMPARE_SCREENSHOTS\r
+ MENUITEM "&Full Size Screenshots", ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS\r
+ MENUITEM "&HTMLs", ID_WEB_COMPARE_HTMLS\r
+ MENUITEM "&Texts", ID_WEB_COMPARE_TEXTS\r
+ MENUITEM "&Resource Trees", ID_WEB_COMPARE_RESOURCETREES\r
+ END\r
+ POPUP "&Size"\r
+ BEGIN\r
+ MENUITEM "Fit to Window", ID_WEB_SIZE_FIT_TO_WINDOW\r
+ MENUITEM "320x512", ID_WEB_SIZE_320x512\r
+ MENUITEM "375x600", ID_WEB_SIZE_375x600\r
+ MENUITEM "1024x640", ID_WEB_SIZE_1024x640\r
+ MENUITEM "1280x800", ID_WEB_SIZE_1280x800\r
+ MENUITEM "1440x900", ID_WEB_SIZE_1440x900\r
+ END\r
+ POPUP "Clear &Browsing Data"\r
+ BEGIN\r
+ MENUITEM "&Disk Cache", ID_WEB_CLEAR_DISK_CACHE\r
+ MENUITEM "&Cookies", ID_WEB_CLEAR_COOKIES\r
+ MENUITEM "&Browsing History", ID_WEB_CLEAR_BROWSING_HISTORY\r
+ MENUITEM "&All Profile", ID_WEB_CLEAR_ALL_PROFILE\r
+ END\r
END\r
END\r
\r
MENUITEM "T&able", ID_FILE_NEW_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW_HEX\r
MENUITEM "&Image", ID_FILE_NEW_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE\r
END\r
POPUP "New (&3 panes)"\r
BEGIN\r
MENUITEM "T&able", ID_FILE_NEW3_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW3_HEX\r
MENUITEM "&Image", ID_FILE_NEW3_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW3_WEBPAGE\r
END\r
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN\r
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT\r
+ MENUITEM "Open C&lipboard", ID_FILE_OPENCLIPBOARD\r
MENUITEM SEPARATOR\r
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT\r
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT\r
END\r
POPUP "&Edit"\r
BEGIN\r
+ MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE\r
+ MENUITEM SEPARATOR\r
MENUITEM "&Options...", ID_OPTIONS\r
END\r
POPUP "&View"\r
MENUITEM "Cl&ose\tCtrl+W", ID_FILE_CLOSE\r
MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL\r
MENUITEM SEPARATOR\r
- MENUITEM "Change &Pane\tF6", ID_WINDOW_CHANGE_PANE\r
+ MENUITEM "Change &Pane\tF6", ID_NEXT_PANE\r
MENUITEM SEPARATOR\r
MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ\r
MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT\r
MENUITEM "T&able", ID_FILE_NEW_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW_HEX\r
MENUITEM "&Image", ID_FILE_NEW_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE\r
END\r
POPUP "New (&3 panes)"\r
BEGIN\r
MENUITEM "T&able", ID_FILE_NEW3_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW3_HEX\r
MENUITEM "&Image", ID_FILE_NEW3_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW3_WEBPAGE\r
END\r
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN\r
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT\r
+ MENUITEM "Open C&lipboard", ID_FILE_OPENCLIPBOARD\r
MENUITEM SEPARATOR\r
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT\r
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT\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
MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL\r
MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO\r
MENUITEM SEPARATOR\r
- MENUITEM "&Edit with Unpacker...", ID_POPUP_OPEN_WITH_UNPACKER\r
+ MENUITEM "&Edit with Unpacker...", ID_OPEN_WITH_UNPACKER\r
MENUITEM SEPARATOR\r
MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS\r
END\r
MENUITEM "Cl&ose\tCtrl+W", ID_FILE_CLOSE\r
MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL\r
MENUITEM SEPARATOR\r
- MENUITEM "Change &Pane\tF6", ID_WINDOW_CHANGE_PANE\r
+ MENUITEM "Change &Pane\tF6", ID_NEXT_PANE\r
MENUITEM SEPARATOR\r
MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ\r
MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT\r
MENUITEM "T&able", ID_FILE_NEW_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW_HEX\r
MENUITEM "&Image", ID_FILE_NEW_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE\r
END\r
POPUP "New (&3 panes)"\r
BEGIN\r
MENUITEM "T&able", ID_FILE_NEW3_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW3_HEX\r
MENUITEM "&Image", ID_FILE_NEW3_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW3_WEBPAGE\r
END\r
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN\r
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT\r
+ MENUITEM "Open C&lipboard", ID_FILE_OPENCLIPBOARD\r
MENUITEM SEPARATOR\r
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT\r
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT\r
MENUITEM SEPARATOR\r
MENUITEM "Mer&ge Mode\tF9", ID_FILE_MERGINGMODE\r
MENUITEM SEPARATOR\r
- MENUITEM "Re&load\tCtrl+F5", ID_RESCAN\r
+ MENUITEM "Reloa&d\tCtrl+F5", ID_RESCAN\r
MENUITEM "&File Encoding...", ID_FILE_ENCODING\r
POPUP "Reco&mpare As"\r
BEGIN\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
+ MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE\r
+ MENUITEM "< Empty >", ID_NO_UNPACKER\r
END\r
MENUITEM SEPARATOR\r
POPUP "Recent F&iles Or Folders"\r
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS\r
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS\r
MENUITEM "View &Margins", ID_VIEW_SELMARGIN\r
+ MENUITEM "View To&p Margins", ID_VIEW_TOPMARGIN\r
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP\r
MENUITEM SEPARATOR\r
POPUP "Sw&ap Panes"\r
BEGIN\r
- MENUITEM "Swap &1st | 2nd", ID_SWAPPANES_SWAP12\r
- MENUITEM "Swap &2nd | 3rd", ID_SWAPPANES_SWAP23\r
- MENUITEM "Swap 1st | &3rd", ID_SWAPPANES_SWAP13\r
+ MENUITEM "Swap &1st | 2nd", ID_SWAPPANES_SWAP12\r
+ MENUITEM "Swap &2nd | 3rd", ID_SWAPPANES_SWAP23\r
+ MENUITEM "Swap 1st | &3rd", ID_SWAPPANES_SWAP13\r
END\r
MENUITEM "Split V&ertically", ID_VIEW_SPLITVERTICALLY\r
MENUITEM SEPARATOR\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
MENUITEM "Ne&xt Conflict\tAlt+Shift+Down", ID_NEXTCONFLICT\r
MENUITEM "Pre&vious Conflict\tAlt+Shift+Up", ID_PREVCONFLICT\r
MENUITEM SEPARATOR\r
+ MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF\r
+ MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF\r
+ MENUITEM "&Last Difference\tAlt+End", ID_LASTDIFF\r
+ MENUITEM SEPARATOR\r
POPUP "A&dvanced"\r
BEGIN\r
MENUITEM "Next Difference Between Left and Middle\tAlt+1", ID_NEXTDIFFLM\r
MENUITEM SEPARATOR\r
MENUITEM "Next Right Only Difference\tAlt+9", ID_NEXTDIFFRO\r
MENUITEM "Previous Right Only Difference\tAlt+Shift+9", ID_PREVDIFFRO\r
+ MENUITEM SEPARATOR\r
+ POPUP "Copy from &Left to"\r
+ BEGIN\r
+ MENUITEM "&Middle", ID_COPY_TO_MIDDLE_L\r
+ MENUITEM "&Right", ID_COPY_TO_RIGHT_L\r
+ END\r
+ POPUP "Copy from &Middle to"\r
+ BEGIN\r
+ MENUITEM "&Left", ID_COPY_TO_LEFT_M\r
+ MENUITEM "&Right", ID_COPY_TO_RIGHT_M\r
+ END\r
+ POPUP "Copy from &Right to"\r
+ BEGIN\r
+ MENUITEM "&Left", ID_COPY_TO_LEFT_R\r
+ MENUITEM "&Middle", ID_COPY_TO_MIDDLE_R\r
+ END\r
+ MENUITEM SEPARATOR\r
+ POPUP "Copy Selected Line(s) from Le&ft to"\r
+ BEGIN\r
+ MENUITEM "&Middle", ID_COPY_LINES_TO_MIDDLE_L\r
+ MENUITEM "&Right", ID_COPY_LINES_TO_RIGHT_L\r
+ END\r
+ POPUP "Copy Selected Line(s) from Mi&ddle to"\r
+ BEGIN\r
+ MENUITEM "&Left", ID_COPY_LINES_TO_LEFT_M\r
+ MENUITEM "&Right", ID_COPY_LINES_TO_RIGHT_M\r
+ END\r
+ POPUP "Copy Selected Line(s) from Ri&ght to"\r
+ BEGIN\r
+ MENUITEM "&Left", ID_COPY_LINES_TO_LEFT_R\r
+ MENUITEM "&Middle", ID_COPY_LINES_TO_MIDDLE_R\r
+ END\r
END\r
MENUITEM SEPARATOR\r
- MENUITEM "&First Difference\tAlt+Home", ID_FIRSTDIFF\r
- MENUITEM "&Current Difference\tAlt+Enter", ID_CURDIFF\r
- MENUITEM "&Last Difference\tAlt+End", ID_LASTDIFF\r
- MENUITEM SEPARATOR\r
MENUITEM "Copy to &Right\tAlt+Right", ID_L2R\r
MENUITEM "Copy to L&eft\tAlt+Left", ID_R2L\r
MENUITEM SEPARATOR\r
MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL\r
MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO\r
MENUITEM SEPARATOR\r
- MENUITEM "&Edit with Unpacker...", ID_POPUP_OPEN_WITH_UNPACKER\r
+ POPUP "Unpac&ker"\r
+ BEGIN\r
+ MENUITEM "< Empty >", ID_NO_UNPACKER\r
+ END\r
+ MENUITEM "&Edit with Unpacker...", ID_OPEN_WITH_UNPACKER\r
MENUITEM SEPARATOR\r
POPUP "&Prediffer"\r
BEGIN\r
MENUITEM "<PlaceHolder>", ID_NO_PREDIFFER\r
END\r
+ MENUITEM "Apply Pre&differ...", ID_APPLY_PREDIFFER\r
MENUITEM SEPARATOR\r
POPUP "&Scripts"\r
BEGIN\r
MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS\r
END\r
+ MENUITEM "&Transform with editor script...", ID_TRANSFORM_WITH_SCRIPT\r
MENUITEM SEPARATOR\r
MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS\r
END\r
MENUITEM "Cl&ose\tCtrl+W", ID_FILE_CLOSE\r
MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL\r
MENUITEM SEPARATOR\r
- MENUITEM "Change &Pane\tF6", ID_WINDOW_CHANGE_PANE\r
+ MENUITEM "Change &Pane\tF6", ID_NEXT_PANE\r
MENUITEM SEPARATOR\r
MENUITEM "Sp&lit", ID_WINDOW_SPLIT\r
MENUITEM SEPARATOR\r
POPUP "_ITEM_POPUP_"\r
BEGIN\r
MENUITEM "Comp&are", ID_MERGE_COMPARE\r
+ MENUITEM "Compare in new &window", ID_MERGE_COMPARE_IN_NEW_WINDOW\r
MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY\r
POPUP "Compare Non-hor&izontally"\r
BEGIN\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
+ MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE\r
+ MENUITEM "< Empty >", ID_NO_UNPACKER\r
END\r
MENUITEM SEPARATOR\r
POPUP "&Copy"\r
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
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\tCtrl+Alt+E", 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\tCtrl+Alt+E", 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\tCtrl+Alt+E", 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 "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
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
MENUITEM "Copy", ID_EDITOR_COPY\r
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 SEPARATOR\r
+ MENUITEM "&Open...", ID_EDITOR_SELECT_FILE\r
END\r
END\r
\r
IDR_POPUP_PLUGINS_SETTINGS MENU\r
BEGIN\r
+ POPUP "Unpacker Settings"\r
+ BEGIN\r
+ MENUITEM "<None>", ID_UNPACKER_SETTINGS_NONE\r
+ MENUITEM "<Automatic>", ID_UNPACKER_SETTINGS_AUTO\r
+ MENUITEM "&Select...", ID_UNPACKER_SETTINGS_SELECT\r
+ END\r
POPUP "Prediffer Settings"\r
BEGIN\r
- MENUITEM "&No prediffer", ID_PREDIFF_MANUAL\r
- MENUITEM "Auto prediffer", ID_PREDIFF_AUTO\r
+ MENUITEM "<None>", ID_PREDIFFER_SETTINGS_NONE\r
+ MENUITEM "<Automatic>", ID_PREDIFFER_SETTINGS_AUTO\r
+ MENUITEM "&Select...", ID_PREDIFFER_SETTINGS_SELECT\r
END\r
END\r
\r
BEGIN\r
POPUP "W&hitespaces"\r
BEGIN\r
- MENUITEM "Com&pare", IDC_DIFF_WHITESPACE_COMPARE\r
- MENUITEM "I&gnore changes", IDC_DIFF_WHITESPACE_IGNORE\r
- MENUITEM "Ig&nore all", IDC_DIFF_WHITESPACE_IGNOREALL\r
+ MENUITEM "Com&pare", ID_DIFF_OPTIONS_WHITESPACE_COMPARE\r
+ MENUITEM "I&gnore changes", ID_DIFF_OPTIONS_WHITESPACE_IGNORE\r
+ MENUITEM "Ig&nore all", ID_DIFF_OPTIONS_WHITESPACE_IGNOREALL\r
+ END\r
+ MENUITEM "Ignore blan&k lines", ID_DIFF_OPTIONS_IGNORE_BLANKLINES\r
+ MENUITEM "Ignore &case", ID_DIFF_OPTIONS_IGNORE_CASE\r
+ MENUITEM "Igno&re carriage return differences (Windows/Unix/Mac)", ID_DIFF_OPTIONS_IGNORE_EOL\r
+ MENUITEM "Ignore codepage &differences", ID_DIFF_OPTIONS_IGNORE_CODEPAGE\r
+ 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
+ POPUP "&Compare method:"\r
+ BEGIN\r
+ MENUITEM "Full Contents", ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS\r
+ MENUITEM "Quick Contents", ID_DIFF_OPTIONS_COMPMETHOD_QUICK_CONTENTS\r
+ MENUITEM "Binary Contents", ID_DIFF_OPTIONS_COMPMETHOD_BINARY_CONTENTS\r
+ MENUITEM "Modified Date", ID_DIFF_OPTIONS_COMPMETHOD_MODDATE\r
+ MENUITEM "Modified Date and Size", ID_DIFF_OPTIONS_COMPMETHOD_DATESIZE\r
+ MENUITEM "Size", ID_DIFF_OPTIONS_COMPMETHOD_SIZE\r
+ END\r
+ END\r
+END\r
+\r
+IDR_POPUP_PROJECT_DIFF_OPTIONS MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ POPUP "W&hitespaces"\r
+ BEGIN\r
+ MENUITEM "Com&pare", ID_PROJECT_DIFF_OPTIONS_WHITESPACE_COMPARE\r
+ MENUITEM "I&gnore changes", ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNORE\r
+ MENUITEM "Ig&nore all", ID_PROJECT_DIFF_OPTIONS_WHITESPACE_IGNOREALL\r
END\r
- MENUITEM "Ignore &case", IDC_DIFF_IGNORECASE\r
- MENUITEM "Igno&re carriage return differences (Windows/Unix/Mac)", IDC_DIFF_IGNOREEOL\r
- MENUITEM "Ignore codepage &differences", IDC_DIFF_IGNORECP\r
+ MENUITEM "Ignore blan&k lines", ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES\r
+ MENUITEM "Ignore &case", ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE\r
+ MENUITEM "Igno&re carriage return differences (Windows/Unix/Mac)", ID_PROJECT_DIFF_OPTIONS_IGNORE_EOL\r
+ MENUITEM "Ignore codepage &differences", ID_PROJECT_DIFF_OPTIONS_IGNORE_CODEPAGE\r
+ MENUITEM "Ignore num&bers", ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS\r
+ MENUITEM "Ignore c&omment differences", ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS\r
MENUITEM SEPARATOR\r
- MENUITEM "&Include Subfolders", IDC_RECURS_CHECK\r
POPUP "&Compare method:"\r
BEGIN\r
- MENUITEM "Full Contents", ID_COMPMETHOD_FULL_CONTENTS\r
- MENUITEM "Quick Contents", ID_COMPMETHOD_QUICK_CONTENTS\r
- MENUITEM "Binary Contents", ID_COMPMETHOD_BINARY_CONTENTS\r
- MENUITEM "Modified Date", ID_COMPMETHOD_MODDATE\r
- MENUITEM "Modified Date and Size", ID_COMPMETHOD_DATESIZE\r
- MENUITEM "Size", ID_COMPMETHOD_SIZE\r
+ MENUITEM "Full Contents", ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS\r
+ MENUITEM "Quick Contents", ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_QUICK_CONTENTS\r
+ MENUITEM "Binary Contents", ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_BINARY_CONTENTS\r
+ MENUITEM "Modified Date", ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_MODDATE\r
+ MENUITEM "Modified Date and Size", ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_DATESIZE\r
+ MENUITEM "Size", ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_SIZE\r
END\r
END\r
END\r
MENUITEM "T&able", ID_FILE_NEW_TABLE\r
MENUITEM "&Binary", ID_FILE_NEW_HEX\r
MENUITEM "&Image", ID_FILE_NEW_IMAGE\r
+ MENUITEM "&Webpage", ID_FILE_NEW_WEBPAGE\r
END\r
END\r
\r
MENUITEM "T&able", ID_MERGE_COMPARE_TABLE\r
MENUITEM "&Binary", ID_MERGE_COMPARE_HEX\r
MENUITEM "&Image", ID_MERGE_COMPARE_IMAGE\r
+ MENUITEM "&Webpage", ID_MERGE_COMPARE_WEBPAGE\r
END\r
END\r
\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
END\r
END\r
\r
+IDR_POPUP_IMG_CTXT MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "Rotate &Right 90deg", ID_IMG_CURPANE_ROTATE_RIGHT_90\r
+ MENUITEM "Rotate &Left 90deg", ID_IMG_CURPANE_ROTATE_LEFT_90\r
+ MENUITEM "Flip V&ertically", ID_IMG_CURPANE_FLIP_VERTICALLY\r
+ MENUITEM "Flip H&orizontally", ID_IMG_CURPANE_FLIP_HORIZONTALLY\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "&Previous Page", ID_IMG_CURPANE_PREVPAGE\r
+ MENUITEM "&Next Page", ID_IMG_CURPANE_NEXTPAGE\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "&Move", ID_IMG_DRAGGINGMODE_MOVE\r
+ MENUITEM "&Adjust Offset", ID_IMG_DRAGGINGMODE_ADJUST_OFFSET\r
+ MENUITEM "&Vertical Wipe", ID_IMG_DRAGGINGMODE_VERTICAL_WIPE\r
+ MENUITEM "&Horizontal Wipe", ID_IMG_DRAGGINGMODE_HORIZONTAL_WIPE\r
+ MENUITEM "Rectangle &Select", ID_IMG_DRAGGINGMODE_RECTANGLE_SELECT\r
+ END\r
+END\r
+\r
+IDR_POPUP_WEBPAGE_COMPARE MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "&Screenshots", ID_WEB_COMPARE_SCREENSHOTS\r
+ MENUITEM "&Full Size Screenshots", ID_WEB_COMPARE_FULLSIZE_SCREENSHOTS\r
+ MENUITEM "&HTMLs", ID_WEB_COMPARE_HTMLS\r
+ MENUITEM "&Texts", ID_WEB_COMPARE_TEXTS\r
+ MENUITEM "&Resource Trees", ID_WEB_COMPARE_RESOURCETREES\r
+ END\r
+END\r
+\r
+\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
// Accelerator\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
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
// LOGO res\\logo.jpg :: Height = 80px, Width=336px (extended fully to Right)\r
- CONTROL "&1st File or Folder",IDC_FILES_DIRS_GROUP0,"Button",BS_GROUPBOX,6,54,454,46,WS_EX_TRANSPARENT\r
+ GROUPBOX "&1st File or Folder",IDC_FILES_DIRS_GROUP0,6,54,454,46,0,WS_EX_TRANSPARENT\r
CONTROL "",IDC_PATH0_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,10,66,446,95\r
CONTROL "Re&ad-only",IDC_PATH0_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,84,100,10\r
PUSHBUTTON "",IDC_SWAP01_BUTTON,120,82,15,14\r
- LTEXT "Swap 1st | 2nd",IDC_SWAP01_STATIC,138,84,88,12\r
+ LTEXT "Swap 1st | 2nd",IDC_SWAP01_STATIC,138,84,100,12\r
PUSHBUTTON "&Browse...",IDC_PATH0_BUTTON,383,82,73,14\r
-\r
- CONTROL "&2nd File or Folder",IDC_FILES_DIRS_GROUP1,"Button",BS_GROUPBOX,6,102,454,46,WS_EX_TRANSPARENT\r
+ GROUPBOX "&2nd File or Folder",IDC_FILES_DIRS_GROUP1,6,102,454,46,0,WS_EX_TRANSPARENT\r
CONTROL "",IDC_PATH1_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,10,114,446,95\r
CONTROL "Rea&d-only",IDC_PATH1_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,132,100,10\r
PUSHBUTTON "",IDC_SWAP12_BUTTON,120,130,15,14\r
- LTEXT "Swap 2nd | 3rd",IDC_SWAP12_STATIC,138,132,88,12\r
+ LTEXT "Swap 2nd | 3rd",IDC_SWAP12_STATIC,138,132,100,12\r
PUSHBUTTON "B&rowse...",IDC_PATH1_BUTTON,383,130,73,14\r
-\r
- CONTROL "&3rd File or Folder (Optional)",IDC_FILES_DIRS_GROUP2,"Button",BS_GROUPBOX,6,150,454,46,WS_EX_TRANSPARENT\r
+ GROUPBOX "&3rd File or Folder (Optional)",IDC_FILES_DIRS_GROUP2,6,150,454,46,0,WS_EX_TRANSPARENT\r
CONTROL "",IDC_PATH2_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,10,162,446,95\r
CONTROL "Read-o&nly",IDC_PATH2_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,180,100,10\r
PUSHBUTTON "",IDC_SWAP02_BUTTON,120,178,15,14\r
- LTEXT "Swap 1st | 3rd",IDC_SWAP02_STATIC,138,180,88,12\r
+ LTEXT "Swap 1st | 3rd",IDC_SWAP02_STATIC,138,180,100,12\r
PUSHBUTTON "Browse...",IDC_PATH2_BUTTON,383,178,73,14\r
-\r
GROUPBOX "",IDC_FILES_DIRS_GROUP3X,6,197,224,42\r
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
-\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
- EDITTEXT IDC_UNPACKER_EDIT,240,209,140,14,ES_AUTOHSCROLL | ES_READONLY\r
+ CONTROL "",IDC_UNPACKER_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,240,209,140,140\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
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
PUSHBUTTON "Help",ID_HELP,383,10,72,14\r
CONTROL "&Options...",IDC_OPTIONS,"Button",BS_SPLITBUTTON | WS_TABSTOP,383,29,72,14\r
END\r
\r
-IDD_PROPPAGE_GENERAL DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_GENERAL DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "General"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "Automatically &scroll to first difference",IDC_SCROLL_CHECK,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,240,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,270,10\r
CONTROL "Automatically s&croll to first inline difference",IDC_SCROLL_TO_FIRST_INLINE_DIFF_CHECK,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,240,10\r
- LTEXT "Cl&ose windows with 'Esc':",IDC_STATIC,7,28,240,10\r
- COMBOBOX IDC_ESC_CLOSES_WINDOW,7,39,240,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,270,10\r
+ LTEXT "Cl&ose windows with 'Esc':",IDC_STATIC,7,28,270,10\r
+ COMBOBOX IDC_ESC_CLOSES_WINDOW,7,39,270,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
- 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
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,56,270,10\r
+ LTEXT "Single instance mode:",IDC_STATIC,7,67,270,10\r
+ COMBOBOX IDC_SINGLE_INSTANCE,7,78,270,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,95,240,10\r
+ "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,240,10\r
- CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,\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,131,240,10\r
- LTEXT "O&pen-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
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,270,10\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
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,131,270,10\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
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
PUSHBUTTON "Cancel",IDCANCEL,240,154,50,14\r
END\r
\r
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 530, 176\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
PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,115,156,50,14\r
END\r
\r
-IDD_IGNORED_SUSBSTITUTIONS_DLG DIALOGEX 0, 0, 530, 176\r
+IDD_FILTERS_SUBSTITUTIONFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
CAPTION "Substitution Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Clear",IDC_LFILTER_CLEARBTN,474,156,50,14\r
END\r
\r
-IDD_PROPPAGE_COLOR_SCHEMES DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COLOR_SCHEMES DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Colors"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Color Scheme:",IDC_STATIC,7,10,233,10\r
- COMBOBOX IDC_COLOR_SCHEMES,7,22,233,93,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Color Scheme:",IDC_STATIC,7,10,266,10\r
+ COMBOBOX IDC_COLOR_SCHEMES,7,22,266,93,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
END\r
\r
-IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Colors"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
CONTROL "",IDC_SEL_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW,214,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
END\r
\r
-IDD_PROPPAGE_COLORS_DIR DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COLORS_DIR DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Colors"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "&Use folder compare colors",IDC_USE_DIR_COMPARE_COLORS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,234,8\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,264,10\r
CTEXT "Background",IDC_STATIC,144,30,50,10\r
CTEXT "Text",IDC_STATIC,197,30,29,10\r
RTEXT "Items equal:",IDC_STATIC,6,48,144,11\r
CONTROL "",IDC_DIR_MARGIN_COLOR,"Button",BS_OWNERDRAW,162,120,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
END\r
\r
-IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "System"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "&Send deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,239,10\r
- LTEXT "&External editor:",IDC_STATIC,7,18,239,10\r
- EDITTEXT IDC_EXT_EDITOR_PATH,7,30,187,14,ES_AUTOHSCROLL\r
- PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,199,30,50,14\r
- LTEXT "&Filter folder:",IDC_STATIC,7,54,239,10\r
- EDITTEXT IDC_FILTER_USER_PATH,7,66,187,14,ES_AUTOHSCROLL\r
- PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,199,66,50,14\r
- GROUPBOX "Temporary files folder",IDC_STATIC,7,90,241,56\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,269,10\r
+ LTEXT "&External editor:",IDC_STATIC,7,18,269,10\r
+ EDITTEXT IDC_EXT_EDITOR_PATH,7,30,217,14,ES_AUTOHSCROLL\r
+ PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,229,30,50,14\r
+ LTEXT "&Filter folder:",IDC_STATIC,7,54,269,10\r
+ EDITTEXT IDC_FILTER_USER_PATH,7,66,217,14,ES_AUTOHSCROLL\r
+ PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,229,66,50,14\r
+ GROUPBOX "Temporary files folder",IDC_STATIC,7,90,271,56\r
CONTROL "S&ystem's temp folder",IDC_TMPFOLDER_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,17,102,223,10\r
- CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,17,114,223,10\r
- EDITTEXT IDC_TMPFOLDER_NAME,27,126,161,14,ES_AUTOHSCROLL | WS_GROUP\r
- PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,194,126,50,14\r
+ CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,17,114,253,10\r
+ EDITTEXT IDC_TMPFOLDER_NAME,27,126,191,14,ES_AUTOHSCROLL | WS_GROUP\r
+ PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,224,126,50,14\r
END\r
\r
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 190\r
COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
PUSHBUTTON "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,52,14\r
PUSHBUTTON "&Swap",IDC_DIFF_SWAPFILES,283,41,52,14\r
+ CONTROL "&Copy to Clipboard",IDC_DIFF_COPYCLIPBOARD,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,48,40,230,10\r
CONTROL "&Append to existing file",IDC_DIFF_APPENDFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10\r
LTEXT "&Result:",IDC_STATIC,7,66,37,10\r
COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
LTEXT "&Context:",IDC_STATIC,13,109,46,10\r
COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWN | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP\r
- GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46\r
- CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10\r
- CONTROL "I&gnore changes",IDC_DIFF_WHITESPACE_IGNORE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10\r
- CONTROL "Ig&nore all",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10\r
- CONTROL "Ignor&e blank lines",IDC_DIFF_WHITESPACE_IGNOREBLANKS,\r
- "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,134,142,10\r
- CONTROL "Ignore &case",IDC_DIFF_IGNORECASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10\r
- CONTROL "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_DIFF_IGNOREEOL,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,281,10\r
- CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10\r
- CONTROL "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10\r
+ CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,170,10\r
+ CONTROL "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,170,10\r
PUSHBUTTON "Defaults",IDC_DIFF_DEFAULTS,7,170,70,14\r
DEFPUSHBUTTON "OK",IDOK,230,170,52,14\r
PUSHBUTTON "Cancel",IDCANCEL,283,170,52,14\r
PUSHBUTTON "Move &Up",IDC_UP,175,8,55,14\r
PUSHBUTTON "Move &Down",IDC_DOWN,175,26,55,14\r
EDITTEXT IDC_COLDLG_DESC,175,80,145,50,ES_MULTILINE | ES_READONLY\r
+ PUSHBUTTON "&Additional Properties",IDC_COLDLG_ADDITIONAL_PROPERTIES,80,143,120,14\r
PUSHBUTTON "Defaults",IDC_COLDLG_DEFAULTS,7,143,70,14\r
DEFPUSHBUTTON "OK",IDOK,221,143,50,14\r
PUSHBUTTON "Cancel",IDCANCEL,275,143,50,14\r
END\r
\r
-IDD_SELECTUNPACKER DIALOGEX 0, 0, 318, 102\r
+IDD_DIRADDITIONALPROPS DIALOGEX 0, 0, 331, 163\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Select Unpacker"\r
+CAPTION "Additional Properties"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,168,84,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,222,84,50,14\r
- LTEXT "File unpacker:",IDC_STATIC,7,9,83,10\r
- COMBOBOX IDC_UNPACKER_NAME,92,7,220,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- CONTROL "Display all unpackers, don't check the extension.",IDC_UNPACKER_ALLOW_ALL,\r
- "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,92,64,220,20\r
- LTEXT "Extensions list:",IDC_STATIC,7,26,63,10\r
- LTEXT "Description:",IDC_STATIC,7,43,63,10\r
- EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,92,24,220,12,ES_AUTOHSCROLL | ES_READONLY\r
- EDITTEXT IDC_UNPACKER_DESCRIPTION,92,38,220,24,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY\r
+ CONTROL "",IDC_PROPS_TREEVIEW,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,6,170,130\r
+ PUSHBUTTON "&>",IDC_PROPS_ADD,181,40,20,14\r
+ PUSHBUTTON "&<",IDC_PROPS_DEL,181,60,20,14\r
+ PUSHBUTTON "<<",IDC_PROPS_DELALL,181,80,20,14\r
+ CONTROL "",IDC_PROPS_LISTVIEW,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,205,6,120,130\r
+ DEFPUSHBUTTON "OK",IDOK,221,143,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,275,143,50,14\r
+END\r
+\r
+IDD_PLUGINS_SELECTPLUGIN DIALOGEX 0, 0, 318, 152\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
+CAPTION "Select Plugin"\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ LTEXT "Plugin &Name:",IDC_STATIC,7,9,83,10\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
+ EDITTEXT IDC_PLUGIN_DESCRIPTION,92,38,220,36,ES_MULTILINE | ES_READONLY | WS_VSCROLL\r
+ LTEXT "Default arguments:",IDC_STATIC,7,78,83,10\r
+ EDITTEXT IDC_PLUGIN_ARGUMENTS,92,76,220,12,ES_AUTOHSCROLL | ES_READONLY\r
+ CONTROL "Display all plugins, don't check the extension",IDC_PLUGIN_ALLOW_ALL,\r
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,92,300,12\r
+ CONTROL "&Open files in the same window type after unpacking",IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE,\r
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,104,300,12\r
+ LTEXT "&Plugin Pipeline:",IDC_STATIC,7,118,83,10\r
+ CONTROL "",IDC_PLUGIN_PIPELINE,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,92,116,220,95\r
+ PUSHBUTTON "&Add pipe",IDC_PLUGIN_ADDPIPE,136,134,70,14\r
+ DEFPUSHBUTTON "OK",IDOK,210,134,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,264,134,50,14\r
END\r
\r
IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 256, 60\r
LTEXT "",IDC_PATH_COMPARING,137,29,111,10\r
END\r
\r
-IDD_WMGOTO DIALOGEX 0, 0, 210, 80\r
+IDD_WMGOTO DIALOGEX 0, 0, 218, 80\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Go to"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "G&o to:",IDC_STATIC,7,9,36,10\r
- EDITTEXT IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER\r
- GROUPBOX "File",IDC_STATIC,7,27,57,45\r
- CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,48,10\r
- CONTROL "&Middle",IDC_WMGOTO_FILEMIDDLE,"Button",BS_AUTORADIOBUTTON,13,48,47,10\r
- CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,13,58,47,10\r
- GROUPBOX "Go to what",IDC_STATIC,69,27,78,45\r
- CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,76,38,68,10\r
- CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",BS_AUTORADIOBUTTON,76,48,68,10\r
- DEFPUSHBUTTON "&Go to",IDOK,153,7,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,153,24,50,14\r
+ LTEXT "G&o to:",IDC_STATIC,7,9,68,10\r
+ EDITTEXT IDC_WMGOTO_PARAM,77,7,78,14,ES_AUTOHSCROLL | ES_NUMBER\r
+ GROUPBOX "File",IDC_STATIC,7,27,65,45\r
+ CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,56,10\r
+ CONTROL "&Middle",IDC_WMGOTO_FILEMIDDLE,"Button",BS_AUTORADIOBUTTON,13,48,56,10\r
+ CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON,13,58,56,10\r
+ GROUPBOX "Go to what",IDC_STATIC,77,27,78,45\r
+ CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,84,38,68,10\r
+ CONTROL "&Difference",IDC_WMGOTO_TODIFF,"Button",BS_AUTORADIOBUTTON,84,48,68,10\r
+ DEFPUSHBUTTON "&Go to",IDOK,161,7,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,161,24,50,14\r
END\r
\r
-IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COMPARE DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Compare"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Whitespaces",IDC_STATIC,7,7,241,50\r
- CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,19,226,10\r
- CONTROL "&Ignore change",IDC_WHITE_CHANGE,"Button",BS_AUTORADIOBUTTON,14,30,226,10\r
- CONTROL "I&gnore all",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,14,41,226,10\r
- CONTROL "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,60,239,10\r
- CONTROL "Ignore &case",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,239,10\r
+ GROUPBOX "Whitespaces",IDC_STATIC,7,7,271,50\r
+ CONTROL "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,19,256,10\r
+ CONTROL "&Ignore change",IDC_WHITE_CHANGE,"Button",BS_AUTORADIOBUTTON,14,30,256,10\r
+ CONTROL "I&gnore all",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,14,41,256,10\r
+ CONTROL "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,60,269,10\r
+ CONTROL "Ignore &case",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,269,10\r
CONTROL "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_EOL_SENSITIVE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,239,10\r
- CONTROL "Ignore codepage &differences",IDC_CP_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,239,10\r
- CONTROL "Ignore c&omment differences",IDC_FILTERCOMMENTS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,239,10\r
- CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,239,10\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,7,174,239,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,269,10\r
+ CONTROL "Ignore num&bers",IDC_IGNORE_NUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,269,10\r
+ CONTROL "Ignore codepage &differences",IDC_CP_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,269,10\r
+ CONTROL "Ignore c&omment differences",IDC_FILTERCOMMENTS_CHECK,\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,239,10\r
+ CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,132,269,10\r
+ CONTROL "Align &similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,269,10\r
+ LTEXT "Diff &algorithm (Experimental):",IDC_STATIC,7,156,269,10\r
+ COMBOBOX IDC_DIFF_ALGORITHM,6,168,270,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ CONTROL "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,186,269,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
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,198,269,10\r
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
END\r
\r
-IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Editor"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- CONTROL "&Highlight syntax",IDC_HILITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,239,10\r
- CONTROL "&Automatic rescan",IDC_AUTOMRESCAN_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,239,10\r
- CONTROL "&Preserve original EOL chars",IDC_MIXED_EOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,239,10\r
- GROUPBOX "Tabs",IDC_STATIC,7,42,241,72,WS_GROUP\r
- LTEXT "&Tab size:",IDC_STATIC,14,54,226,10\r
+ CONTROL "&Highlight syntax",IDC_HILITE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,269,10\r
+ CONTROL "&Automatic rescan",IDC_AUTOMRESCAN_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,269,10\r
+ CONTROL "&Preserve original EOL chars",IDC_MIXED_EOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,269,10\r
+ GROUPBOX "Tabs",IDC_STATIC,7,42,271,72,WS_GROUP\r
+ LTEXT "&Tab size:",IDC_STATIC,14,54,256,10\r
EDITTEXT IDC_TAB_EDIT,24,66,18,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT\r
- CONTROL "&Insert Tabs",IDC_PROP_INSERT_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,84,226,10\r
- CONTROL "Insert &Spaces",IDC_PROP_INSERT_SPACES,"Button",BS_AUTORADIOBUTTON,14,96,226,10\r
- GROUPBOX "Line Difference Coloring",IDC_LINE_COLORING_GROUP,7,114,241,96,WS_GROUP\r
- CONTROL "View line differences",IDC_VIEW_LINE_DIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,126,226,10\r
- CONTROL "&Character level",IDC_EDITOR_CHARLEVEL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,138,216,10\r
- CONTROL "&Word-level:",IDC_EDITOR_WORDLEVEL,"Button",BS_AUTORADIOBUTTON,24,150,216,10\r
- COMBOBOX IDC_BREAK_TYPE,36,162,204,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
- LTEXT "W&ord break characters:",IDC_STATIC,24,180,216,10\r
- EDITTEXT IDC_BREAK_CHARS,24,192,216,14,ES_AUTOHSCROLL\r
- LTEXT "&Rendering Mode:",IDC_STATIC,6,214,240,10\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
+ CONTROL "&Insert Tabs",IDC_PROP_INSERT_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,84,256,10\r
+ CONTROL "Insert &Spaces",IDC_PROP_INSERT_SPACES,"Button",BS_AUTORADIOBUTTON,14,96,256,10\r
+ GROUPBOX "Line Difference Coloring",IDC_LINE_COLORING_GROUP,7,114,271,96,WS_GROUP\r
+ CONTROL "View line differences",IDC_VIEW_LINE_DIFFERENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,126,256,10\r
+ CONTROL "&Character level",IDC_EDITOR_CHARLEVEL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,138,246,10\r
+ CONTROL "&Word-level:",IDC_EDITOR_WORDLEVEL,"Button",BS_AUTORADIOBUTTON,24,150,246,10\r
+ COMBOBOX IDC_BREAK_TYPE,36,162,234,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
+ LTEXT "W&ord break characters:",IDC_STATIC,24,180,246,10\r
+ EDITTEXT IDC_BREAK_CHARS,24,192,246,14,ES_AUTOHSCROLL\r
+ LTEXT "&Rendering Mode:",IDC_STATIC,6,214,270,10\r
+ COMBOBOX IDC_RENDERING_MODE,6,226,270,34,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
+END\r
+\r
+IDD_PROPPAGE_EDITOR_SYNTAX DIALOGEX 0, 0, 285, 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_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,271,215\r
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
+END\r
+\r
+IDD_PROPPAGE_MESSAGEBOXES DIALOGEX 0, 0, 285, 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
+ LTEXT "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again.",IDC_STATIC,7,7,270,30\r
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,191,28,88,14,NOT WS_TABSTOP\r
+ CONTROL "",IDC_MESSAGEBOX_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,47,271,195\r
END\r
\r
IDD_MESSAGE_BOX DIALOGEX 0, 0, 186, 95\r
BEGIN\r
END\r
\r
-IDD_FILEFILTERS DIALOGEX 0, 0, 530, 176\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
PUSHBUTTON "Cancel",IDCANCEL,205,195,50,14\r
END\r
\r
-IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_CODEPAGE DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Codepage"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\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
- "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
- "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
- CONTROL "According to WinMerge User Interface",IDC_CP_UI,"Button",BS_AUTORADIOBUTTON,13,55,230,10\r
- CONTROL "Custom codepage:",IDC_CP_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,68,230,10\r
- COMBOBOX IDC_CUSTOM_CP_NUMBER,12,80,229,130,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP\r
+ GROUPBOX "Default Codepage",IDC_STATIC,7,7,271,93\r
+ LTEXT "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,258,20\r
+ CONTROL "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,260,10\r
+ CONTROL "According to WinMerge User Interface",IDC_CP_UI,"Button",BS_AUTORADIOBUTTON,13,55,260,10\r
+ CONTROL "Custom codepage:",IDC_CP_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,68,260,10\r
+ COMBOBOX IDC_CUSTOM_CP_NUMBER,12,80,259,130,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP\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,269,30\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,269,34\r
+ COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,175,247,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
END\r
\r
-IDD_PREFERENCES DIALOGEX 0, 0, 384, 280\r
+IDD_PREFERENCES DIALOGEX 0, 0, 414, 280\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
CAPTION "Options"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,219,257,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,273,257,50,14\r
- PUSHBUTTON "Help",IDC_TREEOPT_HELP,327,257,50,14\r
- CONTROL "",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | TVS_FULLROWSELECT | WS_HSCROLL | WS_TABSTOP,6,6,109,240\r
- CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,122,0,255,242\r
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,250,370,1\r
- PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,257,50,14\r
- PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,257,50,14\r
+ DEFPUSHBUTTON "OK",IDOK,249,257,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,303,257,50,14\r
+ PUSHBUTTON "Help",IDC_TREEOPT_HELP,357,257,50,14\r
+ CONTROL "",IDC_TREEOPT_PAGES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,6,109,240\r
+ CONTROL "",IDC_TREEOPT_HOSTFRAME,"Static",SS_BLACKFRAME | NOT WS_VISIBLE | WS_DISABLED,122,0,285,242\r
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,250,400,1\r
+ PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,257,60,14\r
+ PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,72,257,60,14\r
END\r
\r
-IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Dialog"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
RTEXT "Preprocessor:",IDC_STATIC,7,156,144,10\r
RTEXT "User 1:",IDC_STATIC,7,174,144,10\r
RTEXT "User 2:",IDC_STATIC,7,192,144,10\r
- CTEXT "Text",IDC_STATIC,144,30,50,8\r
+ CTEXT "Text",IDC_STATIC,144,30,50,10\r
CONTROL "",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "Bold",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,48,55,10\r
CONTROL "",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,192,55,10\r
END\r
\r
-IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COLORS_MARKER DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Dialog"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\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_PROPPAGE_ARCHIVE DIALOGEX 0, 0, 255, 126\r
+IDD_PROPPAGE_ARCHIVE DIALOGEX 0, 0, 285, 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
BEGIN\r
- CONTROL "&Enable archive file support",IDC_ARCHIVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,241,10\r
+ CONTROL "&Enable archive file support",IDC_ARCHIVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,271,10\r
CONTROL "&Detect archive type from file signature",IDC_ARCHIVE_DETECTTYPE,\r
- "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,7,18,241,20\r
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,7,18,271,10\r
+END\r
+\r
+IDD_PROPPAGE_PROJECT DIALOGEX 0, 0, 285, 242\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ LTEXT "Items saved to or restored from the project file:",IDC_STATIC,7,10,270,10\r
+ CONTROL "",IDC_PROJECT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,22,270,76\r
END\r
\r
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 174\r
LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,40,193,10\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
+ COMBOBOX IDC_LOAD_CODEPAGE_TEXTBOX,96,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
+ COMBOBOX IDC_SAVE_CODEPAGE_TEXTBOX,96,90,165,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
+ CONTROL "&BOM",IDC_SAVE_CODEPAGE_BOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,107,165,10\r
CONTROL "&Use same codepage for both",IDC_LOAD_SAVE_SAME_CODEPAGE,\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
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, 255, 242\r
+IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Dialog"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "&Use customized text colors",IDC_DEFAULT_STANDARD_COLORS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,234,8\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,12,234,10\r
RTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,6,48,144,10\r
RTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,6,66,144,10\r
RTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,6,84,144,10\r
- CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,144,30,50,8\r
- CTEXT "Text",IDC_TEXT_COLUMN_LABEL,193,30,29,8\r
+ CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,144,30,50,10\r
+ CTEXT "Text",IDC_TEXT_COLUMN_LABEL,193,30,29,10\r
CONTROL "",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,48,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "",IDC_REGULAR_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,66,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "",IDC_SELECTION_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,84,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
CONTROL "",IDC_MARGIN_BKGD_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,162,102,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
END\r
\r
-IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Backup Files"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Create backup files in:",IDC_STATIC,7,6,239,10\r
- CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,229,10\r
- CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,229,10\r
- LTEXT "Create backup files into:",IDC_STATIC,7,42,239,10\r
- CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,17,54,229,10\r
- CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",BS_AUTORADIOBUTTON,17,66,229,10\r
- EDITTEXT IDC_BACKUP_FOLDER,29,78,165,14,ES_AUTOHSCROLL | WS_GROUP\r
- PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,199,78,50,14\r
- LTEXT "Backup filename:",IDC_STATIC,7,96,239,10\r
- CONTROL "&Append .bak extension",IDC_BACKUP_APPEND_BAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,108,229,10\r
- CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,120,229,10\r
+ LTEXT "Create backup files in:",IDC_STATIC,7,6,269,10\r
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,259,10\r
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,259,10\r
+ LTEXT "Create backup files into:",IDC_STATIC,7,42,269,10\r
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,17,54,259,10\r
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",BS_AUTORADIOBUTTON,17,66,259,10\r
+ EDITTEXT IDC_BACKUP_FOLDER,29,78,195,14,ES_AUTOHSCROLL | WS_GROUP\r
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,229,78,50,14\r
+ LTEXT "Backup filename:",IDC_STATIC,7,96,269,10\r
+ CONTROL "&Append .bak extension",IDC_BACKUP_APPEND_BAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,108,259,10\r
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,120,259,10\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,\r
+ "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
\r
-IDD_PLUGINS_LIST DIALOGEX 0, 0, 470, 231\r
+IDD_PLUGINS_LIST DIALOGEX 0, 0, 470, 257\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Plugins"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
CONTROL "&Enable plugins",IDC_PLUGINS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,266,10\r
CONTROL "",IDC_PLUGINSLIST_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,22,456,155\r
- LTEXT "File filters:",IDC_STATIC,7,190,70,10\r
- COMBOBOX IDC_PLUGIN_FILEFILTERS,80,187,305,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- PUSHBUTTON "Defaults",IDC_PLUGIN_FILEFILTERS_DEFAULTS,393,187,70,14\r
- PUSHBUTTON "P&lugin Settings...",IDC_PLUGIN_SETTINGS,191,210,95,14\r
- DEFPUSHBUTTON "OK",IDOK,293,210,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,354,210,50,14\r
- PUSHBUTTON "Help",ID_HELP,413,210,50,14\r
-END\r
-\r
-IDD_PROPPAGE_SHELL DIALOGEX 0, 0, 255, 242\r
+ LTEXT "File filters:",IDC_STATIC,7,183,70,10\r
+ COMBOBOX IDC_PLUGIN_FILEFILTERS,80,183,305,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "&Plugin arguments:",IDC_STATIC,7,200,70,10\r
+ EDITTEXT IDC_PLUGIN_ARGUMENTS,80,200,305,14,ES_AUTOHSCROLL | WS_GROUP\r
+ CONTROL "Enable &automatic unpacking/prediffing for the plugin",IDC_PLUGIN_AUTOMATIC,\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,218,300,10\r
+ PUSHBUTTON "Defaults",IDC_PLUGIN_DEFAULTS,393,183,70,14\r
+ PUSHBUTTON "P&lugin Settings...",IDC_PLUGIN_SETTINGS,191,236,95,14\r
+ DEFPUSHBUTTON "OK",IDOK,293,236,50,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,354,236,50,14\r
+ PUSHBUTTON "Help",ID_HELP,413,236,50,14\r
+END\r
+\r
+IDD_PROPPAGE_SHELL DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Shell Integration"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Explorer",IDC_STATIC,7,6,238,112\r
- CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,210,10\r
- CONTROL "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,220,10\r
- PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,220,14\r
- PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,220,14\r
- PUSHBUTTON "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,80,220,14\r
- PUSHBUTTON "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,96,220,14\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
+ 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, 255, 242\r
+IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION NC_("Options dialog|Categories", "Folder")\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "&Compare method:",IDC_STATIC,7,6,239,10\r
- COMBOBOX IDC_COMPAREMETHODCOMBO,6,18,240,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "&Compare method:",IDC_STATIC,7,6,269,10\r
+ COMBOBOX IDC_COMPAREMETHODCOMBO,6,18,270,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,36,239,10\r
+ "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,239,10\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
+ "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,72,279,10\r
CONTROL "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,84,239,10\r
- CONTROL "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,96,239,10\r
- LTEXT "&Quick compare limit (MB):",IDC_STATIC,6,108,239,10\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
+ 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 "&Binary compare limit (MB):",IDC_STATIC,6,138,239,10\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
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,161,228,88,14\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
-IDD_PROPPAGE_COMPARE_TABLE DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COMPARE_TABLE DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Table"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "&CSV File Patterns:",IDC_STATIC,6,6,240,10\r
- COMBOBOX IDC_COMPARETABLE_CSV_PATTERNS,7,18,240,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "&TSV File Patterns:",IDC_STATIC,7,36,240,10\r
- COMBOBOX IDC_COMPARETABLE_TSV_PATTERNS,7,48,240,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- GROUPBOX "Custom Delimiter-Separated Values",IDC_STATIC,6,66,240,72\r
- LTEXT "File Patterns:",IDC_STATIC,12,78,228,10\r
- COMBOBOX IDC_COMPARETABLE_DSV_PATTERNS,12,90,228,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "D&elimiter character:",IDC_STATIC,12,108,228,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,240,10\r
- LTEXT "&Quote character:",IDC_STATIC,6,156,240,10\r
- EDITTEXT IDC_COMPARETABLE_QUOTE_CHAR,6,168,30,14,ES_AUTOHSCROLL\r
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,161,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, 255, 242\r
+IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
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,239,10\r
- COMBOBOX IDC_COMPAREBINARY_PATTERNS,7,18,240,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- GROUPBOX "Frhed settings",IDC_STATIC,7,40,241,88\r
- PUSHBUTTON "View &Settings...",IDC_COMPAREBINARY_VIEWSETTINGS,37,58,170,14\r
- PUSHBUTTON "&Binary Mode...",IDC_COMPAREBINARY_BINARYMODE,37,82,170,14\r
- PUSHBUTTON "&Character Set...",IDC_COMPAREBINARY_CHARACTERSET,37,106,170,14\r
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,161,228,88,14\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
+ PUSHBUTTON "&Binary Mode...",IDC_COMPAREBINARY_BINARYMODE,17,82,252,14\r
+ PUSHBUTTON "&Character Set...",IDC_COMPAREBINARY_CHARACTERSET,17,106,252,14\r
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
END\r
\r
-IDD_PROPPAGE_COMPARE_IMAGE DIALOGEX 0, 0, 255, 242\r
+IDD_PROPPAGE_COMPARE_IMAGE DIALOGEX 0, 0, 285, 242\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Image"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Image File &Patterns:",IDC_STATIC,7,6,239,10\r
- COMBOBOX IDC_COMPAREIMAGE_PATTERNS,7,18,240,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\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,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
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,269,10\r
+ LTEXT "OCR result:",IDC_STATIC,7,46,269,10\r
+ COMBOBOX IDC_COMPAREIMAGE_OCR_RESULT_TYPE,7,58,269,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
+END\r
+\r
+IDD_PROPPAGE_COMPARE_WEBPAGE DIALOGEX 0, 0, 285, 242\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
+CAPTION "Webpage"\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
+BEGIN\r
+ LTEXT "URL pattern to &include (Regular expression):",IDC_STATIC,7,6,269,10\r
+ EDITTEXT IDC_COMPAREWEBPAGE_URLPATTERNTOINCLUDE,7,18,270,14,ES_AUTOHSCROLL\r
+ LTEXT "URL pattern to &exclude (Regular expression):",IDC_STATIC,7,32,269,10\r
+ EDITTEXT IDC_COMPAREWEBPAGE_URLPATTERNTOEXCLUDE,7,44,270,14,ES_AUTOHSCROLL\r
+ LTEXT "&User data folder location:",IDC_STATIC,7,60,269,10\r
+ COMBOBOX IDC_COMPAREWEBPAGE_USERDATAFOLDER_TYPE,7,72,270,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ CONTROL "&Separate user data folders for each pane",IDC_COMPAREWEBPAGE_USERDATAFOLDER_PERPANE,\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,88,270,10\r
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
END\r
\r
IDD_ENCODINGERROR DIALOGEX 0, 0, 450, 55\r
CONTROL "",IDC_LIST_FILE,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,0,0,309,176\r
END\r
\r
+IDD_WEBPAGEDIFF_BAR DIALOGEX 0, 0, 714, 18\r
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD\r
+FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
+BEGIN\r
+ CONTROL "Compare",IDC_COMPARE,"Button",BS_SPLITBUTTON | WS_TABSTOP,6,2,72,14\r
+ CONTROL "",IDC_FITTOWINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,2,14,14\r
+ EDITTEXT IDC_WIDTH,98,2,32,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT\r
+ LTEXT "x",-1,134,4,8,10\r
+ EDITTEXT IDC_HEIGHT,140,2,32,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT\r
+ 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
/////////////////////////////////////////////////////////////////////////////\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
\r
IDD_PROPPAGE_COLOR_SCHEMES, DIALOG\r
BEGIN\r
END\r
\r
+ IDD_DIRCOLS, DIALOG\r
+ BEGIN\r
+ END\r
+\r
+ IDD_PLUGINS_SELECTPLUGIN, DIALOG\r
+ BEGIN\r
+ END\r
+\r
IDD_DIRCOMP_PROGRESS, DIALOG\r
BEGIN\r
END\r
BEGIN\r
END\r
\r
- IDD_FILEFILTERS, DIALOG\r
+ IDD_FILTERS_FILEFILTERS, DIALOG\r
BEGIN\r
END\r
\r
BEGIN\r
END\r
\r
+ IDD_PROPPAGE_PROJECT, DIALOG\r
+ BEGIN\r
+ END\r
+\r
IDD_PROPPAGE_COLORS_TEXT, DIALOG\r
BEGIN\r
END\r
IDD_PROPPAGE_COMPARE_IMAGE, DIALOG\r
BEGIN\r
END\r
+\r
+ IDD_WEBPAGEDIFF_BAR, DIALOG\r
+ BEGIN\r
+ RIGHTMARGIN, 237\r
+ END\r
END\r
#endif // APSTUDIO_INVOKED\r
\r
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
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
+ 100, 0, 0, 0\r
END\r
\r
IDD_DIALOG_WINDOWSMANAGER AFX_DIALOG_LAYOUT\r
IDD_PREFERENCES AFX_DIALOG_LAYOUT\r
BEGIN\r
0,\r
- 100, 0, 0, 0,\r
- 100, 0, 0, 0,\r
- 100, 0, 0, 0,\r
- 0, 0, 0, 0,\r
- 0, 0, 100, 0,\r
- 0, 0, 100, 0,\r
- 0, 0, 0, 0,\r
- 0, 0, 0, 0\r
+ 100, 100, 0, 0,\r
+ 100, 100, 0, 0,\r
+ 100, 100, 0, 0,\r
+ 0, 0, 0, 100,\r
+ 0, 0, 100, 100,\r
+ 0, 100, 100, 0,\r
+ 0, 100, 0, 0,\r
+ 0, 100, 0, 0\r
END\r
\r
IDD_PROPPAGE_GENERAL 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
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, 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
100, 0, 0, 0\r
END\r
\r
+IDD_PROPPAGE_COMPARE_WEBPAGE 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
+ 0, 0, 100, 0,\r
+ 0, 0, 100, 0,\r
+ 100, 0, 0, 0\r
+END\r
+\r
IDD_PROPPAGE_EDITOR AFX_DIALOG_LAYOUT\r
BEGIN\r
0,\r
IDD_PROPPAGE_EDITOR_SYNTAX AFX_DIALOG_LAYOUT\r
BEGIN\r
0,\r
+ 0, 0, 100, 100,\r
+ 100, 100, 0, 0\r
+END\r
+\r
+IDD_PROPPAGE_MESSAGEBOXES AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0,\r
0, 0, 100, 0,\r
- 100, 0, 0, 0\r
+ 100, 0, 0, 0,\r
+ 0, 0, 100, 100\r
+END\r
+\r
+IDD_PROPPAGE_PROJECT AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0,\r
+ 0, 0, 100, 0,\r
+ 0, 0, 100, 0\r
END\r
\r
IDD_PROPPAGE_SYSTEM AFX_DIALOG_LAYOUT\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
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_FILTERS_LINEFILTERS AFX_DIALOG_LAYOUT\r
BEGIN\r
0\r
END\r
\r
-IDD_PROPPAGE_FILTER AFX_DIALOG_LAYOUT\r
+IDD_WEB_SIZE AFX_DIALOG_LAYOUT\r
BEGIN\r
0\r
END\r
\r
+IDD_WEBPAGEDIFF_BAR AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0\r
+END\r
+\r
+IDD_PLUGINS_SELECTPLUGIN AFX_DIALOG_LAYOUT\r
+BEGIN\r
+ 0,\r
+ 0, 0, 0, 0,\r
+ 0, 0, 100, 0,\r
+ 0, 0, 0, 0,\r
+ 0, 0, 100, 0,\r
+ 0, 0, 0, 0,\r
+ 0, 0, 100, 100,\r
+ 0, 100, 0, 0,\r
+ 0, 100, 100, 0,\r
+ 0, 100, 100, 0,\r
+ 0, 100, 100, 0,\r
+ 0, 100, 0, 0,\r
+ 0, 100, 100, 0,\r
+ 100, 100, 0, 0,\r
+ 100, 100, 0, 0,\r
+ 100, 100, 0, 0\r
+END\r
+\r
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
IDS_MESSAGEBOX_SKIP "&Skip"\r
IDS_MESSAGEBOX_SKIPALL "Skip &all"\r
IDS_MESSAGEBOX_HELP "&Help"\r
- IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN \r
- "Don't display this &message again."\r
- IDS_MESSAGEBOX_DONT_ASK_AGAIN \r
- "Don't ask this &question again."\r
+ IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN "Don't display this &message again."\r
+ IDS_MESSAGEBOX_DONT_ASK_AGAIN "Don't ask this &question again."\r
IDS_MESSAGEBOX_CHECKBOX_TOOLTIP \r
- "To make this message box visible again, press the Reset button on the General page of the Options dialog."\r
+ "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."\r
END\r
\r
// Options-dialog page captions\r
IDS_OPTIONSPG_SYSTEM "System"\r
IDS_OPTIONSPG_CODEPAGE "Codepage"\r
IDS_OPTIONSPG_ARCHIVE "Archive Support"\r
+ IDS_OPTIONSPG_PROJECT "Project"\r
IDS_OPTIONSPG_BACKUPS "Backup Files"\r
IDS_OPTIONSPG_SHELL "Shell Integration"\r
IDS_OPTIONSPG_MERGECOLORS "Differences"\r
IDS_OPTIONSPG_GENCOMPARE "General"\r
+ IDS_OPTIONSPG_MESSAGEBOXES "Message Boxes"\r
END\r
\r
STRINGTABLE\r
IDS_OPTIONSPG_IMAGECOMPARE "Image"\r
IDS_OPTIONSPG_BINARYCOMPARE NC_("Options dialog|Categories", "Binary")\r
IDS_OPTIONSPG_TABLECOMPARE "Table"\r
+ IDS_OPTIONSPG_WEBPAGECOMPARE "Webpage"\r
END\r
\r
// WINMERGE CUSTOM STRINGS\r
IDS_SYNTAXTABLE_EXTENSION "Extension"\r
END\r
\r
+// MESSAGEBOX OPTIONS\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_MESSAGEBOX_MESSAGE "Message"\r
+ IDS_MESSAGEBOX_ANSWER "Answer"\r
+END\r
+\r
+// PROJECT OPTIONS\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_PROJECT_ITEM "Item"\r
+ IDS_PROJECT_OPEN "Open"\r
+ IDS_PROJECT_LOAD "Load"\r
+ IDS_PROJECT_SAVE "Save"\r
+ IDS_PROJECT_ITEM_FILE_FILTER "File Filters"\r
+ IDS_PROJECT_ITEM_INCLUDE_SUBFOLDERS "Include Subfolders"\r
+ IDS_PROJECT_ITEM_PLUGIN "Plugins"\r
+ IDS_PROJECT_ITEM_COMPARE_OPTIONS "Compare Options"\r
+ IDS_PROJECT_ITEM_HIDDEN_ITEMS "Hidden Items"\r
+END\r
+\r
// FILTER OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_FILEFILTER_SAVENEW "Select filename for new filter"\r
IDS_FILEFILTER_FILEMASK "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"\r
IDS_FILEFILTER_TMPL_MISSING \r
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."\r
+ "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters folder:\n%2."\r
IDS_FILEFILTER_TMPL_COPY \r
"Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."\r
IDS_FILEFILTER_NO_USERFOLDER \r
// STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)\r
STRINGTABLE\r
BEGIN\r
- IDS_LINE_STATUS_INFO_EOL \r
- "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"\r
+ IDS_LINE_STATUS_INFO_EOL "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_OPEN_MIDDLERIGHTINVALID \r
"Middle (2nd) and Right (3rd) paths are invalid!"\r
IDS_OPEN_ALLINVALID "All paths are invalid!"\r
- IDS_OPEN_UNPACKERDISABLED \r
- "Only enabled for file comparisons"\r
+ IDS_OPEN_UNPACKERDISABLED "Only enabled for file comparisons"\r
IDS_OPEN_MISMATCH "Cannot compare file and folder!"\r
END\r
\r
IDS_BREAK_ON_PUNCTUATION "Break at whitespace or punctuation"\r
END\r
\r
+// Merge menu for 3-way compare\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_L2M "Copy to &Middle\tAlt+Right"\r
+ IDS_R2M "Copy to &Middle\tAlt+Left"\r
+ IDS_COPY_FROM_MIDDLE_R "Copy from Middle\tAlt+Shift+Right"\r
+ IDS_COPY_FROM_MIDDLE_L "Copy from Middle\tAlt+Shift+Left"\r
+ IDS_L2MNEXT "Copy to Middle and Advance\tCtrl+Alt+Right"\r
+ IDS_R2MNEXT "Copy to Middle and Advance\tCtrl+Alt+Left"\r
+ IDS_ALL_MIDDLE "Copy All to Middle"\r
+END\r
+\r
// DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)\r
STRINGTABLE\r
BEGIN\r
IDS_CONFIRM_MOVE_CAPTION "Confirm Move"\r
IDS_CONFIRM_CLOSE_WINDOW \r
"You are about to close the window that is comparing folders. Are you sure you want to close the window?"\r
+ IDS_ERROR_INVALID_DIR_FILE_NAME\r
+ "The file or folder name is invalid."\r
END\r
\r
// DIRECTORY DIFFING : OPEN FILE\r
STRINGTABLE\r
BEGIN\r
IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"\r
+ IDS_FAILED_EXTRACT_ARCHIVE_FILES \r
+ "Failed to extract archive files.\nDo you want to compare the archive files as text files?"\r
END\r
\r
// DIRECTORY DIFFING : COLUMN TITLES #1\r
IDS_COLHDR_NIDIFFS "Ignored Diff"\r
IDS_COLHDR_NSDIFFS "Differences"\r
IDS_COLHDR_BINARY NC_("DirView|ColumnHeader", "Binary")\r
+ IDS_COLHDR_UNPACKER "Unpacker"\r
+ IDS_COLHDR_PREDIFFER "Prediffer"\r
+ IDS_COLHDR_LEFT "Left"\r
+ IDS_COLHDR_MIDDLE "Middle"\r
+ IDS_COLHDR_RIGHT "Right"\r
+ IDS_COLHDR_DIFF "Diff"\r
+ IDS_COLHDR_LEFT_DUPLICATE "Left Duplicate Count"\r
+ IDS_COLHDR_RIGHT_DUPLICATE "Right Duplicate Count"\r
+ IDS_COLHDR_MIDDLE_DUPLICATE "Middle Duplicate Count"\r
+ IDS_COLHDR_MOVE "Move"\r
+END\r
+\r
+// DIRECTORY DIFFING : PROPERTY CATEGORIES\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_PRPCAT_SYSTEM "System"\r
+ IDS_PRPCAT_AUDIO "Audio"\r
+ IDS_PRPCAT_CALENDAR "Calendar"\r
+ IDS_PRPCAT_COMMUNICATION "Communication"\r
+ IDS_PRPCAT_CONTACT "Contact"\r
+ IDS_PRPCAT_DEVICES "Devices"\r
+ IDS_PRPCAT_DOCUMENT "Document"\r
+ IDS_PRPCAT_HOME "Home"\r
+ IDS_PRPCAT_IMAGE "Image"\r
+ IDS_PRPCAT_JOURNAL "Journal"\r
+ IDS_PRPCAT_LINK "Link"\r
+ IDS_PRPCAT_MEDIA "Media"\r
+ IDS_PRPCAT_MESSAGE "Message"\r
+ IDS_PRPCAT_MUSIC "Music"\r
+ IDS_PRPCAT_NOTE "Note"\r
+ IDS_PRPCAT_PHOTO "Photo"\r
+ IDS_PRPCAT_RECORDEDTV "RecordedTV"\r
+ IDS_PRPCAT_SEARCH "Search"\r
+ IDS_PRPCAT_SECURITY "Security"\r
+ IDS_PRPCAT_SOFTWARE "Software"\r
+ IDS_PRPCAT_TASK "Task"\r
+ IDS_PRPCAT_VIDEO "Video"\r
+ IDS_PRPCAT_HASH "Hash"\r
END\r
\r
// DIRECTORY DIFFING : FILE COMPARISON RESULT, FULL & SHORTENED FORMS\r
IDS_DIFFERENT "Different"\r
IDS_CMPRES_ERROR "Error"\r
IDS_TEXT_FILES_SAME "Text files are identical"\r
- IDS_LEFTONLY_DIFF "(Middle and right are identical)"\r
- IDS_MIDDLEONLY_DIFF "(Left and right are identical)"\r
- IDS_RIGHTONLY_DIFF "(Left and middle are identical)"\r
+ IDS_LEFTONLY_DIFF " (Middle and right are identical)"\r
+ IDS_MIDDLEONLY_DIFF " (Left and right are identical)"\r
+ IDS_RIGHTONLY_DIFF " (Left and middle are identical)"\r
IDS_TEXT_FILES_DIFF "Text files are different"\r
IDS_IMAGE_FILES_SAME "Image files are identical"\r
IDS_IMAGE_FILES_DIFF "Image files are different"\r
+ IDS_HASH_GROUP "Group%d"\r
END\r
\r
// DIRECTORY DIFFING : SUMMARY BAR\r
IDS_COLDESC_RTIMEC "Right side creation time."\r
IDS_COLDESC_MTIMEC "Middle side creation time."\r
IDS_COLDESC_NEWER "Tells which side has newer modification date."\r
- IDS_COLDESC_LVERSION "Left side file version, only for some filetypes."\r
- IDS_COLDESC_RVERSION "Right side file version, only for some filetypes."\r
+ IDS_COLDESC_LVERSION "Left side file version, only for some file types."\r
+ IDS_COLDESC_RVERSION "Right side file version, only for some file types."\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_COLDESC_MVERSION "Middle side file version, only for some filetypes."\r
+ IDS_COLDESC_MVERSION "Middle side file version, only for some file types."\r
IDS_COLDESC_RESULT_ABBR "Short comparison result."\r
IDS_COLDESC_LATTRIBUTES "Left side attributes."\r
IDS_COLDESC_RATTRIBUTES "Right side attributes."\r
IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."\r
IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences."\r
IDS_COLDESC_BINARY "Shows an asterisk (*) if the file is binary."\r
+ IDS_COLDESC_UNPACKER "Unpacker plugin name or pipeline."\r
+ IDS_COLDESC_PREDIFFER "Prediffer plugin name or pipeline."\r
END\r
\r
// DIRECTORY DIFFING : GENERATE REPORT\r
STRINGTABLE\r
BEGIN\r
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"\r
+ IDS_DIRECTORY_REPORT_TITLE3 "Compare %1 with %2 and %3"\r
IDS_REPORT_COMMALIST "Comma-separated list"\r
IDS_REPORT_TABLIST "Tab-separated list"\r
IDS_REPORT_SIMPLEHTML "Simple HTML"\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
IDS_MUST_SPECIFY_OUTPUT "Specify an output file."\r
IDS_CANNOT_CREATE_BINARYPATCH \r
"Cannot create a patch file from binary files."\r
- IDS_CANNOT_CREATE_DIRPATCH "Cannot create a patch file from directories."\r
IDS_SAVEFILES_FORPATCH "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."\r
IDS_FOLDER_NOTEXIST "Folder does not exist."\r
END\r
ID_FIRSTDIFF "\nFirst Difference (Alt+Home)"\r
ID_CURDIFF "\nCurrent Difference (Alt+Enter)"\r
ID_LASTDIFF "\nLast Difference (Alt+End)"\r
- ID_L2R "\nCopy Right (Alt+Right)"\r
- ID_R2L "\nCopy Left (Alt+Left)"\r
- ID_L2RNEXT "\nCopy Right and Advance (Ctrl+Alt+Right)"\r
- ID_R2LNEXT "\nCopy Left and Advance (Ctrl+Alt+Left)"\r
- ID_ALL_RIGHT "\nAll Right"\r
- ID_ALL_LEFT "\nAll Left"\r
+ ID_L2R "\nCopy to Right (Alt+Right)"\r
+ ID_R2L "\nCopy to Left (Alt+Left)"\r
+ ID_L2RNEXT "\nCopy to Right and Advance (Ctrl+Alt+Right)"\r
+ ID_R2LNEXT "\nCopy to Left and Advance (Ctrl+Alt+Left)"\r
+ ID_ALL_RIGHT "\nCopy All to Right"\r
+ ID_ALL_LEFT "\nCopy All to Left"\r
ID_AUTO_MERGE "\nAuto Merge (Ctrl+Alt+M)"\r
ID_FIRSTFILE "\nFirst File"\r
- ID_NEXTFILE "\nNext File"\r
+ ID_NEXTFILE "\nNext File (Ctrl+F8)"\r
ID_LASTFILE "\nLast File"\r
- ID_PREVFILE "\nPrevious File"\r
+ ID_PREVFILE "\nPrevious File (Ctrl+F7)"\r
\r
END\r
\r
IDS_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)."\r
IDS_NO_PREDIFFER "No prediffer (normal)"\r
IDS_SUGGESTED_PLUGINS "Suggested plugins"\r
- IDS_NOT_SUGGESTED_PLUGINS "Other plugins"\r
+ IDS_NOT_SUGGESTED_PLUGINS "All plugins"\r
END\r
\r
// HELP MENU\r
STRINGTABLE\r
BEGIN\r
IDS_COLORSCHEME_PLAIN "No Highlighting"\r
+ IDS_COLORSCHEME_ABAP "ABAP"\r
IDS_COLORSCHEME_ASP "ASP"\r
IDS_COLORSCHEME_AUTOIT "AutoIt"\r
IDS_COLORSCHEME_BASIC "Basic"\r
IDS_COLORSCHEME_CSHARP "C#"\r
IDS_COLORSCHEME_CSS "CSS"\r
IDS_COLORSCHEME_DCL "DCL"\r
+ IDS_COLORSCHEME_DLANG "D"\r
IDS_COLORSCHEME_FORTRAN "Fortran"\r
IDS_COLORSCHEME_GO "Go"\r
IDS_COLORSCHEME_HTML "HTML"\r
\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
IDS_COLORSCHEME_SGML "SGML"\r
IDS_COLORSCHEME_SH "Shell"\r
IDS_COLORSCHEME_SIOD "SIOD"\r
+ IDS_COLORSCHEME_SMARTY "Smarty"\r
IDS_COLORSCHEME_SQL "SQL"\r
IDS_COLORSCHEME_TCL "TCL"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
+ IDS_WEBPAGE_MENU "We&bpage"\r
+END\r
+\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
IDS_DIFF_ALGORITHM_MINIMAL "minimal"\r
IDS_DIFF_ALGORITHM_PATIENCE "patience"\r
IDS_DIFF_ALGORITHM_HISTOGRAM "histogram"\r
+ IDS_DIFF_ALGORITHM_NONE "none"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
IDS_CLOSE_WINDOWS_WITH_ESC_1 "MDI child window or main window"\r
IDS_CLOSE_WINDOWS_WITH_ESC_2 "MDI child window only"\r
+ IDS_CLOSE_WINDOWS_WITH_ESC_3 "Close main window if there is only one MDI child window"\r
END\r
\r
STRINGTABLE\r
IDS_IMGCMP_STATUS_PT_RGBA_FMT "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "\r
IDS_IMGCMP_STATUS_DIST1_FMT "Dist: %g "\r
IDS_IMGCMP_STATUS_DIST2_FMT "Dist: %g, %g "\r
- IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp"\r
+ IDS_IMGCMP_STATUS_PAGE_ZOOM_SIZE_BPP_FMT "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp "\r
IDS_IMGCMP_STATUS_RC_FMT "Rc: (%d, %d) "\r
+ IDS_IMGCMP_STATUS_FLIPPED_FMT "Flipped: %s "\r
+ IDS_IMGCMP_STATUS_ROTATED_FMT "Rotated: %d "\r
+ IDS_IMGCMP_REPORT_ALLPAGES "All pages"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\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_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
+ 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_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
+ IDS_USERDATAFOLDER_APPDATA "AppData folder"\r
+ IDS_USERDATAFOLDER_INSTALL "Install folder"\r
END\r
\r
STRINGTABLE\r
IDS_SINGLEINSTANCE_STR2 "Allow only one instance to run and wait for the instance to terminate"\r
END\r
\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 "Preview"\r
+ IDS_PLUGIN_PROCESS_TYPE4 "Editor script"\r
+ IDS_PLUGIN_PROCESS_TYPE5 "Data Query"\r
+ IDS_PLUGIN_PROCESS_TYPE6 "Validation"\r
+ IDS_PLUGIN_PROCESS_TYPE7 "Decompilation"\r
+ IDS_PLUGIN_PROCESS_TYPE8 "&Others"\r
+ IDS_PLUGIN_PROCESS_TYPE9 "URL Handling"\r
+ IDS_PLUGIN_MENU_CAPTION1 "Make Uppercase"\r
+ IDS_PLUGIN_MENU_CAPTION2 "Make Lowercase"\r
+ IDS_PLUGIN_MENU_CAPTION3 "Remove Duplicate Lines"\r
+ IDS_PLUGIN_MENU_CAPTION4 "Count Duplicate Lines"\r
+ IDS_PLUGIN_MENU_CAPTION5 "Sort Lines Ascending"\r
+ IDS_PLUGIN_MENU_CAPTION6 "Sort Lines Descending"\r
+ IDS_PLUGIN_MENU_CAPTION7 "Reverse Columns"\r
+ IDS_PLUGIN_MENU_CAPTION8 "Reverse Lines"\r
+ IDS_PLUGIN_MENU_CAPTION9 "Replace..."\r
+ IDS_PLUGIN_MENU_CAPTION10 "Apply Filter Command..."\r
+ IDS_PLUGIN_MENU_CAPTION11 "Tokenize..."\r
+ IDS_PLUGIN_MENU_CAPTION12 "Trim Spaces"\r
+ IDS_PLUGIN_MENU_CAPTION13 "Select Columns..."\r
+ IDS_PLUGIN_MENU_CAPTION14 "Select Lines..."\r
+ IDS_PLUGIN_MENU_CAPTION15 "Insert Date"\r
+ IDS_PLUGIN_MENU_CAPTION16 "Insert Time"\r
+ IDS_PLUGIN_MENU_CAPTION17 "Apply Patch..."\r
+ IDS_PLUGIN_MENU_CAPTION18 "Ignore Columns"\r
+ 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 "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
+ "Missing quotation mark in plugin pipeline: %1"\r
+ IDS_PLUGIN_TITLE1 "Specify plugin arguments"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_PLUGIN_DESCRIPTION1 "Make characters uppercase"\r
+ IDS_PLUGIN_DESCRIPTION2 "Make characters lowercase"\r
+ IDS_PLUGIN_DESCRIPTION3 "Remove duplicate lines"\r
+ IDS_PLUGIN_DESCRIPTION4 "Count duplicate lines"\r
+ IDS_PLUGIN_DESCRIPTION5 "Sort lines ascending"\r
+ IDS_PLUGIN_DESCRIPTION6 "Sort lines descending"\r
+ IDS_PLUGIN_DESCRIPTION7 "Reverse columns"\r
+ IDS_PLUGIN_DESCRIPTION8 "Reverse lines"\r
+ IDS_PLUGIN_DESCRIPTION9 "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n FIND - text to find\r\n REPLACE - text to replace\r\n -i - ignore case (only for -e)\r\n -e - treat the specified text as a regular expression"\r
+ IDS_PLUGIN_DESCRIPTION10 \r
+ "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n COMMAND - command to execute. %1 in the command is replaced with the filename."\r
+ IDS_PLUGIN_DESCRIPTION11 \r
+ "Tokenize selection. \r\nUsage: Tokenize PATTERNS\r\n PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+)"\r
+ IDS_PLUGIN_DESCRIPTION12 "Trim spaces"\r
+ IDS_PLUGIN_DESCRIPTION13 \r
+ "Select some columns.\r\nUsage: SelectColumns RANGES\r\n or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n RANGES - list of column ranges to select. (e.g. -3,5-10,30-)\r\n PATTERNS - regular expression\r\n -v - select non-matching columns\r\n -i - ignore case\r\n -g - enable global flag\r\n -e - use PATTERNS for matching"\r
+ IDS_PLUGIN_DESCRIPTION14 \r
+ "Select some lines.\r\nUsage: SelectLines RANGES\r\n or: SelectLines [-v] [-i] -e PATTERNS\r\n RANGES - list of line ranges to select. (e.g. -3,5-10,30-)\r\n PATTERNS - regular expression\r\n -v - select non-matching lines\r\n -i - ignore case\r\n -e - use PATTERNS for matching"\r
+ IDS_PLUGIN_DESCRIPTION23 \r
+ "HTML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
+ IDS_PLUGIN_DESCRIPTION24 \r
+ "JSON Prettier with jq command. \r\nArguments: Filter or command line options passed to the jq command."\r
+ IDS_PLUGIN_DESCRIPTION25 \r
+ "XML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
+ 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 Previewer. \r\nArguments: Command line options passed to the dot command."\r
+ IDS_PLUGIN_DESCRIPTION28 \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_DESCRIPTION32 \r
+ "JSON Querier with jq command. \r\nArguments: Filter or command line options passed to the jq command."\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_DESCRIPTION34 \r
+ "HTML Validator with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
+ IDS_PLUGIN_DESCRIPTION35 \r
+ "JVM bytecode disassembler with javap. \r\nArguments: Command line options passed to the javap command."\r
+ IDS_PLUGIN_DESCRIPTION36 \r
+ "IL disassembler with ildasm. \r\nArguments: Command line options passed to the ildasm 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_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
+ "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_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
+STRINGTABLE\r
+BEGIN\r
+ IDS_FILTER_APPLIED "Filter applied"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_CLIPBOARDHISTORY_TIME "Clipboard at %s"\r
+ IDS_CLIPBOARDHISTORY_DISABLED "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."\r
+ IDS_CLIPBOARDHISTORY_NOT_SUPPORTED1 \r
+ "This system does not support clipboard history."\r
+ IDS_CLIPBOARDHISTORY_NOT_SUPPORTED2 \r
+ "The 32-bit version of WinMerge does not support Clipboard Compare"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_WEBVIEW2_RUNTIME_NOT_INSTALLED "WebView2 runtime is not installed. Do you want to download it?"\r
+END\r
+\r
+\r
#endif // English (United States) resources\r
/////////////////////////////////////////////////////////////////////////////\r
\r
OSDN Git Service
