BEGIN\r
POPUP "_POPUP_"\r
BEGIN\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 Middle", ID_COPY_LINES_TO_MIDDLE_L\r
- MENUITEM "Copy Selected Line(s) to Right", ID_COPY_LINES_TO_RIGHT_L\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 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 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 "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 "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 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
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
+ 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
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
IDR_MAINFRAME MENU\r
BEGIN\r
POPUP "&File"\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 "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 "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 "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
MENUITEM "< Empty >", ID_NO_UNPACKER\r
END\r
MENUITEM SEPARATOR\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 "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
+ 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
+ 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 "Copy to &Right\tAlt+Right", ID_L2R\r
BEGIN\r
MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS\r
END\r
- MENUITEM "&Transform with editor script...", ID_TRANSFORM_WITH_SCRIPT\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
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
MENUITEM "< Empty >", ID_NO_UNPACKER\r
END\r
MENUITEM SEPARATOR\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
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 "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
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 "Ignore num&bers", IDC_DIFF_IGNORENUMBERS\r
+ MENUITEM "Ignore c&omment differences", ID_DIFF_OPTIONS_IGNORE_COMMENTS\r
MENUITEM SEPARATOR\r
- MENUITEM "&Include Subfolders", ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS\r
+ MENUITEM "&Include subfolders", ID_DIFF_OPTIONS_INCLUDE_SUBFOLDERS\r
POPUP "&Compare method:"\r
BEGIN\r
MENUITEM "Full Contents", ID_DIFF_OPTIONS_COMPMETHOD_FULL_CONTENTS\r
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
+ 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 blan&k lines", ID_PROJECT_DIFF_OPTIONS_IGNORE_BLANKLINES\r
- MENUITEM "Ignore &case", ID_PROJECT_DIFF_OPTIONS_IGNORE_CASE\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 num&bers", ID_PROJECT_DIFF_OPTIONS_IGNORE_NUMBERS\r
MENUITEM "Ignore c&omment differences", ID_PROJECT_DIFF_OPTIONS_IGNORE_COMMENTS\r
MENUITEM SEPARATOR\r
POPUP "&Compare method:"\r
BEGIN\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
+ 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_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
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,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,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,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
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
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,270,10\r
CONTROL "&Preserve file time in file compare",IDC_PRESERVE_FILETIME,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,270,10\r
- CONTROL "Show ""Select Files or Folders"" Dialog on Startup",IDC_STARTUP_FOLDER_SELECT,\r
+ CONTROL "Show ""Select Files or Folders"" dialog on startup",IDC_STARTUP_FOLDER_SELECT,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,270,10\r
- CONTROL "Close ""Select Files or Folders"" Dialog on clicking Compare button",IDC_CLOSE_WITH_OK,\r
+ CONTROL "Close ""Select Files or Folders"" dialog on clicking Compare button",IDC_CLOSE_WITH_OK,\r
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,131,270,10\r
- LTEXT "Op&en-dialog Auto-Completion:",IDC_STATIC,7,145,270,10\r
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,159,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "Language:",IDC_STATIC,7,175,270,10\r
- COMBOBOX IDC_LANGUAGE_LIST,7,187,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Op&en-dialog Auto-Completion:",IDC_STATIC,7,141,270,10\r
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,152,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Auto-&reload modified files:",IDC_STATIC,7,167,270,10\r
+ COMBOBOX IDC_AUTO_RELOAD_MODIFIED_FILES,7,178,270,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Language:",IDC_STATIC,7,193,270,10\r
+ COMBOBOX IDC_LANGUAGE_LIST,7,204,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
END\r
\r
IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96\r
CAPTION "Additional Properties"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- CONTROL "",IDC_PROPS_TREEVIEW,"SysTreeView32", TVS_HASBUTTONS | TVS_LINESATROOT | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,6,170,130\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_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 205,6,120,130\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\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
- COMBOBOX IDC_PLUGIN_NAME,92,7,220,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+ CONTROL "",IDC_PLUGIN_NAME,"ComboBoxEx32",CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,92,7,220,200\r
LTEXT "Extensions list:",IDC_STATIC,7,26,83,10\r
EDITTEXT IDC_PLUGIN_SUPPORTED_EXTENSIONS,92,24,220,12,ES_AUTOHSCROLL | ES_READONLY\r
LTEXT "Description:",IDC_STATIC,7,43,83,10\r
- EDITTEXT IDC_PLUGIN_DESCRIPTION,92,38,220,36,ES_MULTILINE | WS_VSCROLL | ES_READONLY\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
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
+ 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
BEGIN\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
+ 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
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 | WS_BORDER | TVS_FULLROWSELECT | WS_HSCROLL | WS_TABSTOP,6,6,109,240\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
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, 64\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
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,96,90,165,12,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP\r
- CONTROL "&BOM",IDC_SAVE_CODEPAGE_BOM,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,107,165,10\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 "&Close",IDCANCEL,192,121,50,14\r
END\r
\r
-IDD_OPEN_TABLE DIALOGEX 0, 0, 239, 151\r
+IDD_OPEN_TABLE DIALOGEX 0, 0, 239, 181\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Table"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "File type",IDC_STATIC,6,6,222,78\r
+ GROUPBOX "File type",IDC_STATIC,6,6,222,108\r
CONTROL "&CSV",IDC_COMPARETABLE_CSV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,18,210,10\r
- CONTROL "&TSV",IDC_COMPARETABLE_TSV,"Button",BS_AUTORADIOBUTTON,12,30,210,10\r
+ CONTROL "&TSV",IDC_COMPARETABLE_TSV,"Button",BS_AUTORADIOBUTTON,12,58,210,10\r
CONTROL "Custom &Delimiter-Separated Values",IDC_COMPARETABLE_DSV,\r
- "Button",BS_AUTORADIOBUTTON,12,42,210,10\r
- LTEXT "D&elimiter character:",IDC_STATIC,24,54,198,10\r
- EDITTEXT IDC_COMPARETABLE_DSV_DELIM_CHAR,24,66,30,14,ES_AUTOHSCROLL | WS_DISABLED\r
+ "Button",BS_AUTORADIOBUTTON,12,70,210,10\r
+ LTEXT "D&elimiter character:",IDC_STATIC,24,30,198,10\r
+ EDITTEXT IDC_COMPARETABLE_CSV_DELIM_CHAR,24,42,30,14,ES_AUTOHSCROLL\r
+ LTEXT "D&elimiter character:",IDC_STATIC,24,82,198,10\r
+ EDITTEXT IDC_COMPARETABLE_DSV_DELIM_CHAR,24,94,30,14,ES_AUTOHSCROLL | WS_DISABLED\r
CONTROL "&Allow newlines in quotes",IDC_COMPARETABLE_ALLOWNEWLINE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,90,222,10\r
- LTEXT "&Quote character:",IDC_STATIC,6,102,222,10\r
- EDITTEXT IDC_COMPARETABLE_QUOTE_CHAR,6,114,30,14,ES_AUTOHSCROLL\r
- DEFPUSHBUTTON "OK",IDOK,93,126,66,18\r
- PUSHBUTTON "Cancel",IDCANCEL,165,126,66,18\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,118,222,10\r
+ LTEXT "&Quote character:",IDC_STATIC,6,130,222,10\r
+ EDITTEXT IDC_COMPARETABLE_QUOTE_CHAR,6,142,30,14,ES_AUTOHSCROLL\r
+ DEFPUSHBUTTON "OK",IDOK,93,154,66,18\r
+ PUSHBUTTON "Cancel",IDCANCEL,165,154,66,18\r
END\r
\r
IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 285, 242\r
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
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,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,218,300,10\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
CAPTION "Shell Integration"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Explorer",IDC_STATIC,7,6,270,144\r
- CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,240,10\r
+ GROUPBOX "Explorer",IDC_STATIC,7,6,270,156\r
CONTROL "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,250,10\r
- PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,250,14\r
- PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,250,14\r
- PUSHBUTTON "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,80,250,14\r
- PUSHBUTTON "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,96,250,14\r
- PUSHBUTTON "Register shell extension for &Windows 11 or later",IDC_REGISTER_WINMERGECONTEXTMENU,17,112,250,14\r
- PUSHBUTTON "Unregister shell extension for W&indows 11 or later",IDC_UNREGISTER_WINMERGECONTEXTMENU,17,128,250,14\r
+ CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,30,240,10\r
+ CONTROL "Enable &Compare As menu",IDC_EXPLORER_COMPARE_AS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,42,240,10\r
+ PUSHBUTTON "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,60,250,14\r
+ PUSHBUTTON "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,76,250,14\r
+ PUSHBUTTON "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,92,250,14\r
+ PUSHBUTTON "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,108,250,14\r
+ PUSHBUTTON "Register shell extension for &Windows 11 or later",IDC_REGISTER_WINMERGECONTEXTMENU,17,124,250,14\r
+ PUSHBUTTON "Unregister shell extension for W&indows 11 or later",IDC_UNREGISTER_WINMERGECONTEXTMENU,17,140,250,14\r
END\r
\r
IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 285, 242\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,36,279,10\r
CONTROL "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,48,279,10\r
+ CONTROL "&Include subfolders", IDC_RECURS_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 6, 60, 279, 10\r
CONTROL "Include &unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,60,279,10\r
- CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,72,279,10\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,72,279,10\r
CONTROL "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,84,279,10\r
- CONTROL "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,96,279,10\r
+ CONTROL "Ignore &reparse points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,96,279,10\r
LTEXT "Threshold for switching to &quick compare (MB):",IDC_STATIC,6,108,279,10\r
EDITTEXT IDC_COMPARE_QUICKC_LIMIT,6,120,30,14,ES_AUTOHSCROLL\r
LTEXT "Threshold for switching to &binary compare (MB):",IDC_STATIC,6,138,279,10\r
EDITTEXT IDC_COMPARE_BINARYC_LIMIT,6,150,30,14,ES_AUTOHSCROLL\r
- LTEXT "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,6,166,239,30\r
- EDITTEXT IDC_COMPARE_THREAD_COUNT,6,198,30,14,ES_AUTOHSCROLL\r
+ LTEXT "&Number of CPU cores to use:",IDC_STATIC,6,166,239,30\r
+ EDITTEXT IDC_COMPARE_THREAD_COUNT,6,178,30,14,ES_AUTOHSCROLL\r
PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
END\r
\r
CAPTION "Table"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "&CSV File Patterns:",IDC_STATIC,6,6,270,10\r
- COMBOBOX IDC_COMPARETABLE_CSV_PATTERNS,7,18,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "&TSV File Patterns:",IDC_STATIC,7,36,270,10\r
- COMBOBOX IDC_COMPARETABLE_TSV_PATTERNS,7,48,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- GROUPBOX "Custom Delimiter-Separated Values",IDC_STATIC,6,66,270,72\r
- LTEXT "File Patterns:",IDC_STATIC,12,78,258,10\r
- COMBOBOX IDC_COMPARETABLE_DSV_PATTERNS,12,90,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
- LTEXT "D&elimiter character:",IDC_STATIC,12,108,258,10\r
- EDITTEXT IDC_COMPARETABLE_DSV_DELIM_CHAR,12,120,30,14,ES_AUTOHSCROLL\r
+ GROUPBOX "CSV",IDC_STATIC,6,6,270,72\r
+ LTEXT "File patterns:",IDC_STATIC,12,16,248,10\r
+ COMBOBOX IDC_COMPARETABLE_CSV_PATTERNS,12,28,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "D&elimiter character:",IDC_STATIC,12,46,258,10\r
+ EDITTEXT IDC_COMPARETABLE_CSV_DELIM_CHAR,12,58,30,14,ES_AUTOHSCROLL\r
+ GROUPBOX "TSV",IDC_STATIC,6,80,270,42\r
+ LTEXT "File patterns:",IDC_STATIC,12,90,258,10\r
+ COMBOBOX IDC_COMPARETABLE_TSV_PATTERNS,12,102,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+ GROUPBOX "Custom Delimiter-Separated Values",IDC_STATIC,6,124,270,72\r
+ LTEXT "File patterns:",IDC_STATIC,12,136,258,10\r
+ COMBOBOX IDC_COMPARETABLE_DSV_PATTERNS,12,148,258,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "D&elimiter character:",IDC_STATIC,12,166,258,10\r
+ EDITTEXT IDC_COMPARETABLE_DSV_DELIM_CHAR,12,178,30,14,ES_AUTOHSCROLL\r
CONTROL "&Allow newlines in quotes",IDC_COMPARETABLE_ALLOWNEWLINE,\r
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,144,270,10\r
- LTEXT "&Quote character:",IDC_STATIC,6,156,270,10\r
- EDITTEXT IDC_COMPARETABLE_QUOTE_CHAR,6,168,30,14,ES_AUTOHSCROLL\r
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,228,88,14\r
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,202,270,10\r
+ LTEXT "&Quote character:",IDC_STATIC,6,214,270,10\r
+ EDITTEXT IDC_COMPARETABLE_QUOTE_CHAR,6,226,30,14,ES_AUTOHSCROLL\r
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,191,226,88,14\r
END\r
\r
IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 285, 242\r
CAPTION NC_("Options dialog|Categories", "Binary")\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Binary File &Patterns:",IDC_STATIC,7,6,269,10\r
+ LTEXT "Binary file &patterns:",IDC_STATIC,7,6,269,10\r
COMBOBOX IDC_COMPAREBINARY_PATTERNS,7,18,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
GROUPBOX "Frhed settings",IDC_STATIC,7,40,271,88\r
PUSHBUTTON "View &Settings...",IDC_COMPAREBINARY_VIEWSETTINGS,17,58,252,14\r
CAPTION "Image"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Image File &Patterns:",IDC_STATIC,7,6,269,10\r
+ LTEXT "Image file &patterns:",IDC_STATIC,7,6,269,10\r
COMBOBOX IDC_COMPAREIMAGE_PATTERNS,7,18,270,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
CONTROL "&Enable image compare in folder compare",IDC_ENABLE_IMGCMP_IN_DIRCMP,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,269,10\r
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
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\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
\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
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
+ 0, 0, 0, 0,\r
100, 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, 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, 0,\r
- 100, 0, 0, 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
- 0, 0, 100, 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
+ 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
0, 0, 100, 0\r
END\r
0\r
END\r
\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 Message Boxes page of the Options dialog."\r
END\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
// MESSAGEBOX OPTIONS\r
STRINGTABLE\r
BEGIN\r
- IDS_MESSAGEBOX_MESSAGE "Message"\r
- IDS_MESSAGEBOX_ANSWER "Answer"\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 "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
// 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_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
// 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
+ 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
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 "Failed to extract archive files.\nDo you want to compare the archive files as text files?"\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
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
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
\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
\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
\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_IGNSUB_STR1 "<Edit here>"\r
+ IDS_IGNSUB_STR2 "No differences to select found"\r
+ IDS_IGNSUB_STR3 "No differences found to add as substitution filter"\r
+ IDS_IGNSUB_STR4 "The pair is already present in the list of Substitution Filters"\r
+ IDS_IGNSUB_STR5 "Add this change to Substitution Filters?"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_OCRRESULT_TEXTONLY "Text only"\r
+ IDS_OCRRESULT_POS_LINE "Line-by-line position and text"\r
+ IDS_OCRRESULT_POS_WORD "Word-by-word position and text"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_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
\r
STRINGTABLE\r
BEGIN\r
- IDS_PLUGIN_ALL "Al&l"\r
+ IDS_AUTO_RELOAD_MODIFIED_FILES_STR1 "Only on window activated"\r
+ IDS_AUTO_RELOAD_MODIFIED_FILES_STR2 "Immediately"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_PLUGIN_ALL "Al&l"\r
IDS_PLUGIN_PROCESS_TYPE1 "Prettification"\r
IDS_PLUGIN_PROCESS_TYPE2 "Content Extraction"\r
- IDS_PLUGIN_PROCESS_TYPE3 "Visualization"\r
+ IDS_PLUGIN_PROCESS_TYPE3 "Preview"\r
IDS_PLUGIN_PROCESS_TYPE4 "Editor script"\r
IDS_PLUGIN_PROCESS_TYPE5 "Data Query"\r
IDS_PLUGIN_PROCESS_TYPE6 "Validation"\r
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_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_CAPTION19 "Ignore Comments (C-Family Languages)"\r
IDS_PLUGIN_MENU_CAPTION20 "Ignore CSV Fields"\r
IDS_PLUGIN_MENU_CAPTION21 "Ignore TSV Fields"\r
- IDS_PLUGIN_MENU_CAPTION22 "Apply Prediff Substitution Filters"\r
- IDS_PLUGIN_MENU_CAPTION23 "Prettify HTML"\r
- IDS_PLUGIN_MENU_CAPTION24 "Prettify JSON"\r
- IDS_PLUGIN_MENU_CAPTION25 "Prettify XML"\r
- IDS_PLUGIN_MENU_CAPTION26 "Prettify YAML"\r
- IDS_PLUGIN_MENU_CAPTION27 "Visualize Graphviz"\r
- IDS_PLUGIN_MENU_CAPTION28 "Query CSV Data..."\r
- IDS_PLUGIN_MENU_CAPTION29 "Query TSV Data..."\r
- IDS_PLUGIN_MENU_CAPTION30 "Query JSON Data..."\r
- IDS_PLUGIN_MENU_CAPTION31 "Query YAML Data..."\r
- IDS_PLUGIN_MENU_CAPTION32 "Validate HTML"\r
- IDS_PLUGIN_MENU_CAPTION33 "Disassemble JVM Bytecode"\r
- IDS_PLUGIN_MENU_CAPTION34 "Disassemble IL Code"\r
- IDS_PLUGIN_MENU_CAPTION35 "Disassemble Native Code"\r
- IDS_PLUGIN_MISSING_PLUGIN_NAME "Missing plugin name in plugin pipeline: %1"\r
- IDS_PLUGIN_MISSING_QUOTATION_MARK"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 "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 "Tokenize selection. \r\nUsage: Tokenize PATTERNS\r\n PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+)"\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 "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 "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 "HTML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
- IDS_PLUGIN_DESCRIPTION24 "JSON Prettier with jq command. \r\nArguments: Filter or command line options passed to the jq command."\r
- IDS_PLUGIN_DESCRIPTION25 "XML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
- IDS_PLUGIN_DESCRIPTION26 "YAML Prettier with yq command. \r\nArguments: Filter or command line options passed to the yq command."\r
- IDS_PLUGIN_DESCRIPTION27 "Graphviz Visualizer. \r\nArguments: Command line options passed to the dot command."\r
- IDS_PLUGIN_DESCRIPTION28 "CSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."\r
- IDS_PLUGIN_DESCRIPTION29 "TSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."\r
- IDS_PLUGIN_DESCRIPTION30 "JSON Querier with jq command. \r\nArguments: Filter or command line options passed to the jq command."\r
- IDS_PLUGIN_DESCRIPTION31 "YAML Querier with yq command. \r\nArguments: Filter or command line options passed to the yq command."\r
- IDS_PLUGIN_DESCRIPTION32 "HTML Validator with tidy-html5. \r\nArguments: Command line options passed to the tidy command."\r
- IDS_PLUGIN_DESCRIPTION33 "JVM bytecode disassembler with javap. \r\nArguments: Command line options passed to the javap command."\r
- IDS_PLUGIN_DESCRIPTION34 "IL disassembler with ildasm. \r\nArguments: Command line options passed to the ildasm command."\r
- IDS_PLUGIN_DESCRIPTION35 "Native code disassembler with dumpbin. \r\nArguments: Command line options passed to the dumpbin command."\r
- IDS_PLUGIN_DESCRIPTION37 "General content extractor with Apache Tika. \r\nArguments: Command line options passed to the tika-app.jar."\r
- IDS_PLUGIN_DESCRIPTION38 "Apply patch using GnuWin32 Patch for Windows"\r
- IDS_PLUGIN_DESCRIPTION39 "Display the text content of MS Excel files"\r
- IDS_PLUGIN_DESCRIPTION40 "Display the text content of MS PowerPoint files"\r
- IDS_PLUGIN_DESCRIPTION41 "Display the text content of MS Visio files"\r
- IDS_PLUGIN_DESCRIPTION42 "Display the text content of MS Word files"\r
- IDS_PLUGIN_DESCRIPTION43 "Ignore some columns - ignored columns list from the plugin name or the plugin argument"\r
- IDS_PLUGIN_DESCRIPTION44 "The plugin ignores comments (//... and /* ... */) in C, C++, PHP and JavaScript files."\r
- IDS_PLUGIN_DESCRIPTION45 "Ignore some fields - ignored fields list from the plugin name or the plugin argument"\r
- IDS_PLUGIN_DESCRIPTION46 "Prediff Line Filter"\r
- IDS_PLUGIN_DESCRIPTION47 "Basic text functions for the context menu"\r
- IDS_PLUGIN_DESCRIPTION48 "HTTP URL Scheme Handler with curl. \r\nArguments: Command line options passed to the curl command."\r
- IDS_PLUGIN_DESCRIPTION49 "Windows Registry URL Scheme Handler. \r\nArguments: Command line options passed to the reg.exe command."\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_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 "This system does not support clipboard history."\r
- IDS_CLIPBOARDHISTORY_NOT_SUPPORTED2 "The 32-bit version of WinMerge does not support Clipboard Compare"\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
