MENUITEM "Zoom &In\tCtrl++", ID_VIEW_ZOOMIN\r
MENUITEM "Zoom &Out\tCtrl+-", ID_VIEW_ZOOMOUT\r
MENUITEM SEPARATOR\r
- MENUITEM "&Normal\tCtrl+*", ID_VIEW_ZOOMNORMAL\r
+ MENUITEM "&Normal\tCtrl+*", ID_VIEW_ZOOMNORMAL //#. Zoom to normal\r
END\r
POPUP "&Overlay"\r
BEGIN\r
MENUITEM "Zoom &In\tCtrl++", ID_VIEW_ZOOMIN\r
MENUITEM "Zoom &Out\tCtrl+-", ID_VIEW_ZOOMOUT\r
MENUITEM SEPARATOR\r
- MENUITEM "&Normal\tCtrl+*", ID_VIEW_ZOOMNORMAL\r
+ MENUITEM "&Normal\tCtrl+*", ID_VIEW_ZOOMNORMAL //#. Zoom to normal\r
END\r
POPUP "Syntax Highlight"\r
BEGIN\r
POPUP "_ITEM_POPUP_"\r
BEGIN\r
MENUITEM "Comp&are", ID_MERGE_COMPARE\r
- MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY\r
+ MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY\r
POPUP "Compare Non-hor&izontally"\r
BEGIN\r
MENUITEM "First &left item with second left item", ID_MERGE_COMPARE_LEFT1_LEFT2\r
MENUITEM "First &right item with second right item", ID_MERGE_COMPARE_RIGHT1_RIGHT2\r
MENUITEM "&First left item with second right item", ID_MERGE_COMPARE_LEFT1_RIGHT2\r
MENUITEM "&Second left item with first right item", ID_MERGE_COMPARE_LEFT2_RIGHT1\r
- MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY\r
+ MENUITEM "Compare Non-hor&izontally...", ID_MERGE_COMPARE_NONHORIZONTALLY\r
END\r
POPUP "Co&mpare As"\r
BEGIN\r
\r
IDR_MAINFRAME ACCELERATORS\r
BEGIN\r
- "M", ID_AUTO_MERGE, VIRTKEY, CONTROL, ALT, NOINVERT\r
- VK_RIGHT, ID_COPY_FROM_LEFT, VIRTKEY, SHIFT, ALT, NOINVERT\r
- VK_LEFT, ID_COPY_FROM_RIGHT, VIRTKEY, SHIFT, ALT, NOINVERT\r
- VK_RETURN, ID_CURDIFF, VIRTKEY, ALT, NOINVERT\r
- VK_F2, ID_DIR_ITEM_RENAME, VIRTKEY, NOINVERT\r
+ "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT\r
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
- VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
+ "D", ID_VIEW_DIFFCONTEXT_TOGGLE, VIRTKEY, CONTROL, NOINVERT\r
+ "E", ID_FILE_OPEN_WITHEDITOR, VIRTKEY, CONTROL, ALT, NOINVERT\r
"C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
- VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
- "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT\r
- "U", ID_EDIT_LOWERCASE, VIRTKEY, CONTROL, NOINVERT\r
+ "G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT\r
+ "H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT\r
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT\r
"M", ID_EDIT_MARK, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
+ "M", ID_AUTO_MERGE, VIRTKEY, CONTROL, ALT, NOINVERT\r
+ "N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT\r
+ "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
+ "P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT\r
+ "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
+ "U", ID_EDIT_LOWERCASE, VIRTKEY, CONTROL, NOINVERT\r
+ "U", ID_EDIT_UPPERCASE, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
"V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT\r
- VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
+ "W", ID_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT\r
+ "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT\r
"Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT\r
+ "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
"Z", ID_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
- VK_F3, ID_EDIT_REPEAT, VIRTKEY, NOINVERT\r
- VK_F3, ID_EDIT_REPEAT, VIRTKEY, CONTROL, NOINVERT\r
+ VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
+ VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT\r
+ VK_DOWN, ID_NEXTDIFF, VIRTKEY, ALT, NOINVERT\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_F7, ID_PREVDIFF, VIRTKEY, NOINVERT\r
+ VK_F7, ID_PREVCONFLICT, VIRTKEY, SHIFT, 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
+ VK_F3, ID_EDIT_REPEAT, VIRTKEY, NOINVERT\r
VK_F3, ID_EDIT_REPEAT, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
- "H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT\r
- "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT\r
- VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT\r
- "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT\r
- "U", ID_EDIT_UPPERCASE, VIRTKEY, SHIFT, CONTROL, NOINVERT\r
- "G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT\r
- "W", ID_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT\r
+ VK_F3, ID_EDIT_REPEAT, VIRTKEY, CONTROL, NOINVERT\r
+ VK_F4, ID_SELECTLINEDIFF, VIRTKEY, NOINVERT\r
+ VK_F4, ID_SELECTPREVLINEDIFF, VIRTKEY, SHIFT, NOINVERT\r
+ VK_F5, ID_REFRESH, VIRTKEY, NOINVERT\r
+ VK_F5, ID_RESCAN, VIRTKEY, CONTROL, NOINVERT\r
+ VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
+ VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
VK_F9, ID_FILE_MERGINGMODE, VIRTKEY, NOINVERT\r
- "N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT\r
- "O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT\r
- "E", ID_FILE_OPEN_WITHEDITOR, VIRTKEY, CONTROL, ALT, NOINVERT\r
- "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT\r
- "P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT\r
- "S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT\r
VK_HOME, ID_FIRSTDIFF, VIRTKEY, ALT, NOINVERT\r
+ VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT\r
+ VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT\r
+ VK_LEFT, ID_R2L, VIRTKEY, ALT, NOINVERT\r
+ VK_LEFT, ID_R2LNEXT, VIRTKEY, CONTROL, ALT, NOINVERT\r
+ VK_LEFT, ID_COPY_FROM_RIGHT, VIRTKEY, SHIFT, ALT, NOINVERT\r
+ VK_RETURN, ID_CURDIFF, VIRTKEY, ALT, NOINVERT\r
VK_RIGHT, ID_L2R, VIRTKEY, ALT, NOINVERT\r
VK_RIGHT, ID_L2RNEXT, VIRTKEY, CONTROL, ALT, NOINVERT\r
- VK_END, ID_LASTDIFF, VIRTKEY, ALT, NOINVERT\r
- VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT\r
- VK_DOWN, ID_NEXTCONFLICT, VIRTKEY, SHIFT, ALT, NOINVERT\r
- VK_F8, ID_NEXTCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
- VK_DOWN, ID_NEXTDIFF, VIRTKEY, ALT, NOINVERT\r
- VK_F8, ID_NEXTDIFF, VIRTKEY, NOINVERT\r
- VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT\r
- VK_F7, ID_PREVCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
- VK_UP, ID_PREVCONFLICT, VIRTKEY, SHIFT, ALT, NOINVERT\r
- VK_F7, ID_PREVDIFF, VIRTKEY, NOINVERT\r
+ VK_RIGHT, ID_COPY_FROM_LEFT, VIRTKEY, SHIFT, ALT, NOINVERT\r
VK_UP, ID_PREVDIFF, VIRTKEY, ALT, NOINVERT\r
- VK_LEFT, ID_R2L, VIRTKEY, ALT, NOINVERT\r
- VK_LEFT, ID_R2LNEXT, VIRTKEY, CONTROL, ALT, NOINVERT\r
- VK_F5, ID_REFRESH, VIRTKEY, NOINVERT\r
- VK_F5, ID_RESCAN, VIRTKEY, CONTROL, NOINVERT\r
- VK_F4, ID_SELECTLINEDIFF, VIRTKEY, NOINVERT\r
- VK_F4, ID_SELECTPREVLINEDIFF, VIRTKEY, SHIFT, NOINVERT\r
- "D", ID_VIEW_DIFFCONTEXT_TOGGLE, VIRTKEY, CONTROL, NOINVERT\r
+ VK_UP, ID_PREVCONFLICT, VIRTKEY, SHIFT, ALT, NOINVERT\r
VK_ADD, ID_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT\r
VK_OEM_PLUS, ID_VIEW_ZOOMIN, VIRTKEY, CONTROL, NOINVERT\r
- "0", ID_VIEW_ZOOMNORMAL, VIRTKEY, CONTROL, NOINVERT\r
- VK_MULTIPLY, ID_VIEW_ZOOMNORMAL, VIRTKEY, CONTROL, NOINVERT\r
- VK_OEM_MINUS, ID_VIEW_ZOOMOUT, VIRTKEY, CONTROL, NOINVERT\r
VK_SUBTRACT, ID_VIEW_ZOOMOUT, VIRTKEY, CONTROL, NOINVERT\r
- "Q", ID_ACCEL_QUIT, VIRTKEY, CONTROL, NOINVERT\r
+ VK_OEM_MINUS, ID_VIEW_ZOOMOUT, VIRTKEY, CONTROL, NOINVERT\r
+ VK_MULTIPLY, ID_VIEW_ZOOMNORMAL, VIRTKEY, CONTROL, NOINVERT\r
+ "0", ID_VIEW_ZOOMNORMAL, VIRTKEY, CONTROL, NOINVERT\r
END\r
\r
\r
CAPTION "Select Files or Folders"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "&1st File or Folder",IDC_FILES_DIRS_GROUP0,6,54,454,46,0,WS_EX_TRANSPARENT\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
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
PUSHBUTTON "&Browse...",IDC_PATH0_BUTTON,383,82,73,14\r
- GROUPBOX "&2nd File or Folder",IDC_FILES_DIRS_GROUP1,6,102,454,46,0,WS_EX_TRANSPARENT\r
+\r
+ CONTROL "&2nd File or Folder",IDC_FILES_DIRS_GROUP1,"Button",BS_GROUPBOX,6,102,454,46,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
PUSHBUTTON "B&rowse...",IDC_PATH1_BUTTON,383,130,73,14\r
- GROUPBOX "&3rd File or Folder (Optional)",IDC_FILES_DIRS_GROUP2,6,150,454,46,0,WS_EX_TRANSPARENT\r
+\r
+ CONTROL "&3rd File or Folder (Optional)",IDC_FILES_DIRS_GROUP2,"Button",BS_GROUPBOX,6,150,454,46,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
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
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
PUSHBUTTON "Se&lect...",IDC_SELECT_UNPACKER,383,209,73,14\r
+\r
CONTROL "Sa&ve Project...",ID_SAVE_PROJECT,"Button",BS_SPLITBUTTON | WS_TABSTOP,10,245,100,14\r
DEFPUSHBUTTON "Co&mpare",IDOK,316,245,70,20\r
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
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,4,15,152,10\r
+ CONTROL "&Use folder compare colors",IDC_USE_DIR_COMPARE_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,15,152,10\r
CTEXT "Background",IDC_STATIC,154,29,50,10\r
CTEXT "Text",IDC_STATIC,207,29,29,10\r
RTEXT "Items equal:",IDC_STATIC,4,49,152,20\r
\r
IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 255, 205\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
-CAPTION "\001""Options dialog|Categories""Folder"\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,100,10\r
\r
IDD_PROPPAGE_COMPARE_BINARY DIALOGEX 0, 0, 255, 205\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
-CAPTION "\001""Options dialog|Categories""Binary"\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,200,10\r
BOTTOMMARGIN, 264\r
END\r
\r
- IDD_DIR_FILTER, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_EDIT_MARKER, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PROPPAGE_SYSTEM, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_DIRCOLS, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_SELECTUNPACKER, DIALOG\r
- BEGIN\r
- END\r
-\r
IDD_DIRCOMP_PROGRESS, DIALOG\r
BEGIN\r
END\r
\r
- IDD_WMGOTO, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PROPPAGE_COMPARE, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PROPPAGE_EDITOR, DIALOG\r
- BEGIN\r
- END\r
-\r
IDD_SAVECLOSING, DIALOG\r
BEGIN\r
END\r
\r
- IDD_PROPPAGE_CODEPAGE, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PREFERENCES, DIALOG\r
- BEGIN\r
- END\r
-\r
IDD_PROPPAGE_COLORS_MARKER, DIALOG\r
BEGIN\r
END\r
\r
- IDD_DIRCMP_REPORT, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_SHARED_FILTER, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PROP_ARCHIVE, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_COMPARE_STATISTICS, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_COMPARE_STATISTICS3, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_TEST_FILTER, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PROPPAGE_BACKUPS, DIALOG\r
- BEGIN\r
- END\r
-\r
IDD_CONFIRM_COPY, DIALOG\r
BEGIN\r
END\r
-\r
- IDD_PLUGINS_LIST, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_PROPPAGE_COMPARE_FOLDER, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_SELECT_FILES_OR_FOLDERS, DIALOG\r
- BEGIN\r
- END\r
-\r
- IDD_DIALOG_WINDOWSMANAGER, DIALOG\r
- BEGIN\r
- END\r
END\r
#endif // APSTUDIO_INVOKED\r
\r
AFX_IDS_APP_TITLE "WinMerge"\r
END\r
\r
+// Generic status bar strings\r
STRINGTABLE\r
BEGIN\r
ID_INDICATOR_EXT "EXT"\r
ID_INDICATOR_REC "REC"\r
END\r
\r
+// Generic File menu commands\r
STRINGTABLE\r
BEGIN\r
ID_FILE_NEW "\nNew Documents (Ctrl+N)"\r
ID_FILE_SAVE "\nSave (Ctrl+S)"\r
END\r
\r
+// WinMerge Project Files\r
STRINGTABLE\r
BEGIN\r
IDS_UNK_ERROR_READING_PROJECT \r
IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved."\r
END\r
\r
+// Generic Edit commands\r
STRINGTABLE\r
BEGIN\r
ID_EDIT_UNDO "\nUndo (Ctrl+Z)"\r
ID_EDIT_REDO "\nRedo (Ctrl+Y)"\r
END\r
\r
+// WINMERGE INFORMATION\r
STRINGTABLE\r
BEGIN\r
IDR_MAINFRAME "WinMerge"\r
IDR_DIRDOCTYPE "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"\r
END\r
\r
+// SPLASH SCREEN TEXTS\r
STRINGTABLE\r
BEGIN\r
IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"\r
IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."\r
END\r
\r
+// "DO NOT SHOW AGAIN" MESSAGEBOXES\r
STRINGTABLE\r
BEGIN\r
IDS_MESSAGEBOX_OK "&Ok"\r
IDS_MESSAGEBOX_YES "&Yes"\r
END\r
\r
+// "DO NOT SHOW AGAIN" MESSAGEBOXES (2)\r
STRINGTABLE\r
BEGIN\r
IDS_MESSAGEBOX_YES_TO_ALL "Yes to &all"\r
IDS_MESSAGEBOX_SKIP "&Skip"\r
IDS_MESSAGEBOX_SKIPALL "Skip &all"\r
IDS_MESSAGEBOX_HELP "&Help"\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_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_CHECKBOX_TOOLTIP \r
"To make this messagebox visible again, press the Reset button on the General page of the Options dialog."\r
END\r
\r
+// Options-dialog page captions\r
STRINGTABLE\r
BEGIN\r
IDS_OPTIONSPG_GENERAL "General"\r
IDS_OPTIONSPG_TEXTCOLORS "Text"\r
IDS_OPTIONSPG_SYNTAXCOLORS "Syntax"\r
IDS_OPTIONSPG_MARKERCOLORS "Markers"\r
+ IDS_OPTIONSPG_DIRCOLORS "Folder Compare"\r
IDS_OPTIONSPG_SYSTEM "System"\r
IDS_OPTIONSPG_CODEPAGE "Codepage"\r
IDS_OPTIONSPG_ARCHIVE "Archive Support"\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_OPTIONSPG_FOLDERCOMPARE "\001""Options dialog|Categories""Folder"\r
+ IDS_OPTIONSPG_FOLDERCOMPARE NC_("Options dialog|Categories", "Folder")\r
IDS_OPTIONSPG_IMAGECOMPARE "Image"\r
- IDS_OPTIONSPG_BINARYCOMPARE "\001""Options dialog|Categories""Binary"\r
- IDS_OPTIONSPG_DIRCOLORS "Folder Compare"\r
+ IDS_OPTIONSPG_BINARYCOMPARE NC_("Options dialog|Categories", "Binary")\r
END\r
\r
+// WINMERGE CUSTOM STRINGS\r
STRINGTABLE\r
BEGIN\r
IDS_TO "To:"\r
IDS_TO_RIGHT "To right:"\r
END\r
\r
+// WINMERGE INFORMATION\r
STRINGTABLE\r
BEGIN\r
IDS_VERSION_FMT "Version %1"\r
IDS_WINX64 "X64"\r
END\r
\r
+// VARIOUS OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_OPTIONS_TITLE "Options (%1)"\r
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."\r
END\r
\r
+// BROWSE FILE\r
STRINGTABLE\r
BEGIN\r
IDS_OPEN_TITLE "Open"\r
IDS_INIFILES "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"\r
END\r
\r
+// REPORT FILES\r
STRINGTABLE\r
BEGIN\r
IDS_TEXT_REPORT_FILES "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"\r
IDS_XML_REPORT_FILES "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"\r
END\r
\r
+// COMPARE OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_COMPMETHOD_FULL_CONTENTS "Full Contents"\r
IDS_COMPMETHOD_QUICK_CONTENTS "Quick Contents"\r
IDS_COMPMETHOD_BINARY_CONTENTS "Binary Contents"\r
-END\r
-\r
-STRINGTABLE\r
-BEGIN\r
IDS_COMPMETHOD_MODDATE "Modified Date"\r
IDS_COMPMETHOD_DATESIZE "Modified Date and Size"\r
IDS_COMPMETHOD_SIZE "Size"\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
END\r
\r
+// FILTER OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_FILTERFILE_NAMETITLE "Name"\r
"Filter file already exists. Overwrite existing filter?"\r
END\r
\r
+// LINEFILTER STRINGS\r
STRINGTABLE\r
BEGIN\r
IDS_FILTERLINE_REGEXP "Regular expression"\r
END\r
\r
+// GENERAL FILTER STRINGS\r
STRINGTABLE\r
BEGIN\r
IDS_FILTERCHANGED "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."\r
END\r
\r
+// WINDOWS TITLES\r
STRINGTABLE\r
BEGIN\r
IDS_DIRECTORY_WINDOW_TITLE "Folder Comparison Results"\r
IDS_CONFLICT_MINE_FILE "Mine File"\r
END\r
\r
+// STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)\r
STRINGTABLE\r
BEGIN\r
- IDS_LINE_STATUS_INFO_EOL "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"\r
+ IDS_LINE_STATUS_INFO_EOL \r
+ "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"\r
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"\r
IDS_LINE_STATUS_INFO "Ln: %s Col: %d/%d Ch: %d/%d"\r
IDS_MERGEMODE_MERGING "Merge"\r
IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"\r
IDS_NO_DIFF_SEL_FMT "%1 Differences Found"\r
IDS_1_DIFF_FOUND "1 Difference Found"\r
- IDS_STATUSBAR_READONLY "RO"\r
+ IDS_STATUSBAR_READONLY "RO" //#. Abbreviation from "Read Only"\r
+END\r
+\r
+// MORE STATUS PANES\r
+STRINGTABLE\r
+BEGIN\r
IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"\r
IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"\r
END\r
\r
+// OPEN DIALOG\r
STRINGTABLE\r
BEGIN\r
IDS_ERROR_INCOMPARABLE "Select two existing folders or files to compare"\r
IDS_OPEN_LEFTINVALID "Left (1st) path is invalid!"\r
IDS_OPEN_MIDDLEINVALID "Middle (2nd) path is invalid!"\r
IDS_OPEN_RIGHTINVALID2 "Right (2nd) path is invalid!"\r
+ IDS_OPEN_RIGHTINVALID3 "Right (3rd) path is invalid!"\r
IDS_OPEN_BOTHINVALID "Both paths are invalid!"\r
IDS_OPEN_LEFTMIDDLEINVALID \r
"Left (1st) and Middle (2nd) paths are invalid!"\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 "Only enabled for File comparisons"\r
+ IDS_OPEN_UNPACKERDISABLED \r
+ "Only enabled for File comparisons"\r
IDS_OPEN_MISMATCH "Cannot compare file and folder!"\r
- IDS_OPEN_RIGHTINVALID3 "Right (3rd) path is invalid!"\r
END\r
\r
+// LOADING FILE\r
STRINGTABLE\r
BEGIN\r
IDS_ERROR_FILE_NOT_FOUND "File not found: %1"\r
IDS_NOT_CONFLICT_FILE "The file\n%1\nis not a conflict file."\r
END\r
\r
+// SAVING FILE\r
STRINGTABLE\r
BEGIN\r
IDS_SAVE_AS_TITLE "Save As"\r
IDS_FILE_DISAPPEARED "The file\n%1\nhas disappeared. Please save a copy of the file to continue."\r
END\r
\r
+// Editing/Merging file\r
STRINGTABLE\r
BEGIN\r
IDS_VIEWS_OUTOFSYNC "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."\r
IDS_BREAK_ON_PUNCTUATION "Break at whitespace or punctuation"\r
END\r
\r
+// DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)\r
STRINGTABLE\r
BEGIN\r
IDS_COPY_RIGHT_TO_LEFT "Right to Left (%1)"\r
IDS_COPY_DIFFERENCES_TO2 "Differences to... (%1 of %2)"\r
END\r
\r
+// DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK) (2)\r
STRINGTABLE\r
BEGIN\r
IDS_DEL_LEFT_FMT "Left (%1)"\r
IDS_SELECT_DEST_RIGHT "Right side - select destination folder:"\r
IDS_FILES_AFFECTED_FMT "(%1 Files Affected)"\r
IDS_FILES_AFFECTED_FMT2 "(%1 of %2 Files Affected)"\r
+END\r
+\r
+// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION\r
+STRINGTABLE\r
+BEGIN\r
IDS_CONFIRM_DELETE_SINGLE "Are you sure you want to delete\n\n%1 ?"\r
IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"\r
IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"\r
"You are about to close the window that is comparing folders. Are you sure you want to close the window?"\r
END\r
\r
+// DIRECTORY DIFFING : OPEN FILE\r
STRINGTABLE\r
BEGIN\r
IDS_ERROR_EXECUTE_FILE "Failed to execute external editor: %1"\r
END\r
\r
+// DIRECTORY DIFFING : 7ZIP\r
STRINGTABLE\r
BEGIN\r
IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"\r
END\r
\r
+// DIRECTORY DIFFING : COLUMN TITLES #1\r
STRINGTABLE\r
BEGIN\r
IDS_COLHDR_FILENAME "Filename"\r
- IDS_COLHDR_DIR "\001""DirView|ColumnHeader""Folder"\r
+ IDS_COLHDR_DIR NC_("DirView|ColumnHeader", "Folder")\r
IDS_COLHDR_RESULT "Comparison result"\r
IDS_COLHDR_LTIMEM "Left Date"\r
IDS_COLHDR_RTIMEM "Right Date"\r
IDS_COLHDR_MSIZE_SHORT "Middle Size (Short)"\r
END\r
\r
+// DIRECTORY DIFFING : COLUMN TITLES #2\r
STRINGTABLE\r
BEGIN\r
IDS_COLHDR_LTIMEC "Left Creation Time"\r
IDS_COLHDR_REOL_TYPE "Right EOL"\r
END\r
\r
+// DIRECTORY DIFFING : COLUMN TITLES #3\r
STRINGTABLE\r
BEGIN\r
IDS_COLHDR_LENCODING "Left Encoding"\r
IDS_COLHDR_MENCODING "Middle Encoding"\r
IDS_COLHDR_NIDIFFS "Ignored Diff"\r
IDS_COLHDR_NSDIFFS "Differences"\r
- IDS_COLHDR_BINARY "\001""DirView|ColumnHeader""Binary"\r
+ IDS_COLHDR_BINARY NC_("DirView|ColumnHeader", "Binary")\r
END\r
\r
+// DIRECTORY DIFFING : FILE COMPARISON RESULT, FULL & SHORTENED FORMS\r
STRINGTABLE\r
BEGIN\r
IDS_CANT_COMPARE_FILES "Unable to compare files"\r
IDS_DIFFERENT "Different"\r
IDS_CMPRES_ERROR "Error"\r
IDS_TEXT_FILES_SAME "Text files are identical"\r
-END\r
-\r
-STRINGTABLE\r
-BEGIN\r
- IDS_TEXT_FILES_DIFF "Text files are different"\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
END\r
\r
+// DIRECTORY DIFFING : SUMMARY BAR\r
STRINGTABLE\r
BEGIN\r
IDS_ELAPSED_TIME "Elapsed time: %ld ms"\r
IDS_STATUS_SELITEMS "%1 items selected"\r
END\r
\r
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1\r
STRINGTABLE\r
BEGIN\r
IDS_COLDESC_FILENAME "Filename or folder name."\r
IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated."\r
IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated."\r
IDS_COLDESC_MSIZE_SHORT "Middle file size abbreviated."\r
+END\r
+\r
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2\r
+STRINGTABLE\r
+BEGIN\r
IDS_COLDESC_LTIMEC "Left side creation time."\r
IDS_COLDESC_RTIMEC "Right side creation time."\r
IDS_COLDESC_MTIMEC "Middle side creation time."\r
IDS_COLDESC_MEOL_TYPE "Middle side file EOL type."\r
END\r
\r
+// DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)\r
STRINGTABLE\r
BEGIN\r
IDS_COLDESC_LENCODING "Left side encoding."\r
IDS_COLDESC_BINARY "Shows an asterisk (*) if the file is binary."\r
END\r
\r
+// DIRECTORY DIFFING : GENERATE REPORT\r
STRINGTABLE\r
BEGIN\r
IDS_DIRECTORY_REPORT_TITLE "Compare %1 with %2"\r
IDS_REPORT_SUCCESS "The report has been created successfully."\r
END\r
\r
+// FILE COMPARISON RESULT : MESSAGES\r
STRINGTABLE\r
BEGIN\r
IDS_FILE_TO_ITSELF "The same file is opened in both panels."\r
IDS_MOVE_TO_PREVPAGE "Do you want to move to the previous page?"\r
END\r
\r
+// Encoding issues\r
STRINGTABLE\r
BEGIN\r
IDS_SUGGEST_IGNORECODEPAGE \r
"Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"\r
+ IDS_LOSSY_TRANSCODING_BOTH \r
+ "Information lost due to encoding errors: both files"\r
IDS_LOSSY_TRANSCODING_FIRST \r
"Information lost due to encoding errors: first file"\r
IDS_LOSSY_TRANSCODING_SECOND \r
"Information lost due to encoding errors: second file"\r
IDS_LOSSY_TRANSCODING_THIRD \r
"Information lost due to encoding errors: third file"\r
- IDS_LOSSY_TRANSCODING_BOTH \r
- "Information lost due to encoding errors: both files"\r
END\r
\r
+// EDITOR : SHOW LINE DIFF\r
STRINGTABLE\r
BEGIN\r
IDS_LINEDIFF_NODIFF "No difference"\r
IDS_LINEDIFF_NODIFF_CAPTION "Line difference"\r
END\r
\r
+// EDITOR : SEARCH/REPLACE DIALOGS\r
STRINGTABLE\r
BEGIN\r
IDS_NUM_REPLACED "Replaced %1 string(s)."\r
IDS_EDIT_TEXT_NOT_FOUND "Cannot find string ""%s"""\r
END\r
\r
+// EDITOR : MERGE MODE\r
STRINGTABLE\r
BEGIN\r
IDS_MERGE_MODE "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"\r
END\r
\r
+// EDITOR : AUTO MERGE\r
STRINGTABLE\r
BEGIN\r
IDS_AUTO_MERGE "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"\r
IDS_EOL_CONFLICT "The changes of EOL are conflicting"\r
END\r
\r
+// FILE COMPARE: PANE CAPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_LOCBAR_CAPTION "Location Pane"\r
IDS_DIFFBAR_CAPTION "Diff Pane"\r
END\r
\r
+// CREATE PATCH\r
STRINGTABLE\r
BEGIN\r
IDS_DIFF_SUCCEEDED "Patch file successfully written."\r
IDS_CLOSEALL_WINDOWS "You are about to close several compare windows.\n\nDo you want to continue?"\r
END\r
\r
+// EOL types shown in folder compare EOL type column and in file compare statusbar\r
STRINGTABLE\r
BEGIN\r
IDS_EOL_DOS "Win"\r
IDS_EOL_MAC "Mac"\r
IDS_EOL_UNIX "Unix"\r
IDS_EOL_MIXED "Mixed"\r
- IDS_EOL_BIN "\001""EOL Type""Binary"\r
+ IDS_EOL_BIN NC_("EOL Type", "Binary")\r
IDS_EOL_LF "LF"\r
IDS_EOL_CR "CR"\r
IDS_EOL_CRLF "CRLF"\r
IDS_PLUGINS_TYPE_EDITSCRIPT "Editor script"\r
END\r
\r
+// EDIT MENU\r
STRINGTABLE\r
BEGIN\r
ID_SELECTLINEDIFF "\nDifference in the Current Line"\r
ID_REFRESH "\nRefresh (F5)"\r
END\r
\r
+// MERGE MENU\r
STRINGTABLE\r
BEGIN\r
ID_PREVDIFF "\nPrevious Difference (Alt+Up)"\r
ID_AUTO_MERGE "\nAuto Merge (Ctrl+Alt+M)"\r
END\r
\r
+// PLUGINS MENU\r
STRINGTABLE\r
BEGIN\r
- IDS_PRIVATEBUILD_FMT "Private Build: %1"\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
END\r
\r
+// HELP MENU\r
STRINGTABLE\r
BEGIN\r
+ IDS_PRIVATEBUILD_FMT "Private Build: %1"\r
IDS_CHECKFORUPDATES_UPTODATE "Your software is up to date"\r
IDS_CHECKFORUPDATES_NEWVERSION \r
"A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"\r
+END\r
+\r
+STRINGTABLE\r
+BEGIN\r
IDS_CHECKFORUPDATES_FAILED "Failed to download latest version information"\r
- IDS_TITLE_PLUGINS_SETTINGS "Plugin Settings"\r
- IDS_NO_EDIT_SCRIPTS "< Empty >"\r
END\r
\r
+// PLUGINS DIALOGS AND DYNAMIC MENUS\r
STRINGTABLE\r
BEGIN\r
+ IDS_TITLE_PLUGINS_SETTINGS "Plugin Settings"\r
+ IDS_NO_EDIT_SCRIPTS "< Empty >"\r
IDS_NO_SCT_SCRIPTS "WSH not found - .sct scripts disabled"\r
IDS_USERCHOICE_NONE "<None>"\r
IDS_USERCHOICE_AUTOMATIC "<Automatic>"\r
- IDS_CLOSE_LEFT_TABS "Close &Left Tabs"\r
- IDS_CLOSE_RIGHT_TABS "Close R&ight Tabs"\r
END\r
\r
+// LOCATIONBAR CONTEXT MENU\r
STRINGTABLE\r
BEGIN\r
IDS_LOCBAR_GOTOLINE_FMT "G&oto Line %1"\r
END\r
\r
+// AUTOCOMPLETE COMBOBOX OPTIONS\r
STRINGTABLE\r
BEGIN\r
IDS_AUTOCOMPLETE_DISABLED "Disabled"\r
IDS_AUTOCOMPLETE_MRU "From MRU list"\r
END\r
\r
+// COLOR SCHEMES\r
STRINGTABLE\r
BEGIN\r
IDS_COLORSCHEME_PLAIN "No Highlighting"\r
IDS_COLORSCHEME_INSTALLSHIELD "InstallShield"\r
IDS_COLORSCHEME_JAVA "Java"\r
IDS_COLORSCHEME_LISP "AutoLISP"\r
+ IDS_COLORSCHEME_LUA "Lua"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_COLORSCHEME_LUA "Lua"\r
IDS_COLORSCHEME_NSIS "NSIS"\r
IDS_COLORSCHEME_PASCAL "Pascal"\r
IDS_COLORSCHEME_PERL "Perl"\r
IDS_COLORSCHEME_SH "Shell"\r
IDS_COLORSCHEME_SIOD "SIOD"\r
IDS_COLORSCHEME_SQL "SQL"\r
+ IDS_COLORSCHEME_TCL "TCL"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_COLORSCHEME_TCL "TCL"\r
IDS_COLORSCHEME_TEX "TEX"\r
IDS_COLORSCHEME_VERILOG "Verilog"\r
IDS_COLORSCHEME_VHDL "VHDL"\r
\r
STRINGTABLE\r
BEGIN\r
+ IDS_CLOSE_LEFT_TABS "Close &Left Tabs"\r
+ IDS_CLOSE_RIGHT_TABS "Close R&ight Tabs"\r
IDS_CLOSE_OTHER_TABS "Close &Other Tabs"\r
IDS_TABBAR_AUTO_MAXWIDTH "Enable &Auto Max Width"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_DIFF_ALGORITHM_DEFAULT "default"\r
- IDS_DIFF_ALGORITHM_MINIMAL "minimal"\r
- IDS_DIFF_ALGORITHM_PATIENCE "patience"\r
+ IDS_DIFF_ALGORITHM_DEFAULT "default"\r
+ IDS_DIFF_ALGORITHM_MINIMAL "minimal"\r
+ IDS_DIFF_ALGORITHM_PATIENCE "patience"\r
IDS_DIFF_ALGORITHM_HISTOGRAM "histogram"\r
- IDS_RENDERING_MODE_GDI "GDI"\r
- IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT "DirectWrite Default"\r
END\r
\r
STRINGTABLE\r
BEGIN\r
- IDS_RENDERING_MODE_DIRECTWRITE_ALIASED "DirectWrite Aliased"\r
- IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC "DirectWrite GDI Classic"\r
- IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL "DirectWrite GDI Natural"\r
- IDS_RENDERING_MODE_DIRECTWRITE_NATURAL "DirectWrite Natural"\r
- IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC \r
- "DirectWrite Natural Symmetric"\r
+ IDS_RENDERING_MODE_GDI "GDI"\r
+ IDS_RENDERING_MODE_DIRECTWRITE_DEFAULT "DirectWrite Default"\r
+ IDS_RENDERING_MODE_DIRECTWRITE_ALIASED "DirectWrite Aliased"\r
+ IDS_RENDERING_MODE_DIRECTWRITE_GDI_CLASSIC "DirectWrite GDI Classic"\r
+ IDS_RENDERING_MODE_DIRECTWRITE_GDI_NATURAL "DirectWrite GDI Natural"\r
+ IDS_RENDERING_MODE_DIRECTWRITE_NATURAL "DirectWrite Natural"\r
+ IDS_RENDERING_MODE_DIRECTWRITE_NATURAL_SYMMETRIC "DirectWrite Natural Symmetric"\r
END\r
\r
#endif // English (United States) resources\r
OSDN Git Service
