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 "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
LTEXT " Folder: Filter",IDC_FILES_DIRS_GROUP3,10,198,86,11\r
COMBOBOX IDC_EXT_COMBO,10,209,140,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
PUSHBUTTON "&Select...",IDC_SELECT_FILTER,153,209,73,14\r
- CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,227,143,10\r
+ CONTROL "&Include subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,227,143,10\r
LTEXT " File: Prediffer Plugin",IDC_FILES_DIRS_GROUP5,10,198,120,11,NOT WS_VISIBLE\r
CONTROL "",IDC_PREDIFFER_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP,10,209,140,95\r
PUSHBUTTON "&Select...",IDC_SELECT_PREDIFFER,153,209,73,14,NOT WS_VISIBLE\r
"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,141,270,10\r
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,152,270,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\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
"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 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,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
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
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
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
\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_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_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 "Preview Graphviz"\r
- IDS_PLUGIN_MENU_CAPTION28 "Preview Markdown"\r
- IDS_PLUGIN_MENU_CAPTION29 "Preview PlantUML"\r
- IDS_PLUGIN_MENU_CAPTION30 "Query CSV Data..."\r
- IDS_PLUGIN_MENU_CAPTION31 "Query TSV Data..."\r
- IDS_PLUGIN_MENU_CAPTION32 "Query JSON Data..."\r
- IDS_PLUGIN_MENU_CAPTION33 "Query YAML Data..."\r
- IDS_PLUGIN_MENU_CAPTION34 "Validate HTML"\r
- IDS_PLUGIN_MENU_CAPTION35 "Disassemble JVM Bytecode"\r
- IDS_PLUGIN_MENU_CAPTION36 "Disassemble IL Code"\r
- IDS_PLUGIN_MENU_CAPTION37 "Disassemble Native Code"\r
+ IDS_PLUGIN_MENU_CAPTION22 "Ignore Leading Line Numbers"\r
+ IDS_PLUGIN_MENU_CAPTION23 "Apply Prediff Substitution Filters"\r
+ IDS_PLUGIN_MENU_CAPTION24 "Prettify HTML"\r
+ IDS_PLUGIN_MENU_CAPTION25 "Prettify JSON"\r
+ IDS_PLUGIN_MENU_CAPTION26 "Prettify XML"\r
+ IDS_PLUGIN_MENU_CAPTION27 "Prettify YAML"\r
+ IDS_PLUGIN_MENU_CAPTION28 "Preview Graphviz"\r
+ IDS_PLUGIN_MENU_CAPTION29 "Preview Markdown"\r
+ IDS_PLUGIN_MENU_CAPTION30 "Preview PlantUML"\r
+ IDS_PLUGIN_MENU_CAPTION31 "Query CSV Data..."\r
+ IDS_PLUGIN_MENU_CAPTION32 "Query TSV Data..."\r
+ IDS_PLUGIN_MENU_CAPTION33 "Query JSON Data..."\r
+ IDS_PLUGIN_MENU_CAPTION34 "Query YAML Data..."\r
+ IDS_PLUGIN_MENU_CAPTION35 "Validate HTML"\r
+ IDS_PLUGIN_MENU_CAPTION36 "Disassemble JVM Bytecode"\r
+ IDS_PLUGIN_MENU_CAPTION37 "Disassemble IL Code"\r
+ IDS_PLUGIN_MENU_CAPTION38 "Disassemble Native Code"\r
IDS_PLUGIN_MISSING_PLUGIN_NAME \r
"Missing plugin name in plugin pipeline: %1"\r
IDS_PLUGIN_MISSING_QUOTATION_MARK \r