MENUITEM "With &Registered Application", ID_FILE_OPEN_REGISTERED\r
MENUITEM "With &External Editor\tCtrl+Alt+E", ID_FILE_OPEN_WITHEDITOR\r
MENUITEM "&With...", ID_FILE_OPEN_WITH\r
+ MENUITEM "Open &Parent Folder...", ID_FILE_OPEN_PARENT_FOLDER\r
END\r
MENUITEM "S&hell Menu", ID_FILE_SHELLMENU\r
END\r
MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY\r
END\r
MENUITEM SEPARATOR\r
- MENUITEM "File En&coding...", ID_FILE_ENCODING\r
+ MENUITEM "&File Encoding...", ID_FILE_ENCODING\r
MENUITEM SEPARATOR\r
POPUP "Recent F&iles Or Folders"\r
BEGIN\r
MENUITEM SEPARATOR\r
MENUITEM "Com&pare Statistics...", ID_VIEW_DIR_STATISTICS\r
MENUITEM SEPARATOR\r
- MENUITEM "Refre&sh\tF5", ID_REFRESH\r
+ MENUITEM "Refresh\tF5", ID_REFRESH\r
MENUITEM "&Refresh Selected\tCtrl+F5", ID_RESCAN\r
END\r
POPUP "&Merge"\r
MENUITEM "Diff &Pane", ID_VIEW_DETAIL_BAR\r
MENUITEM "Lo&cation Pane", ID_VIEW_LOCATION_BAR\r
MENUITEM SEPARATOR\r
- MENUITEM "Refre&sh\tF5", ID_REFRESH\r
+ MENUITEM "Refresh\tF5", ID_REFRESH\r
END\r
POPUP "&Merge"\r
BEGIN\r
POPUP "&Open Left"\r
BEGIN\r
MENUITEM "With &Registered Application", ID_DIR_OPEN_LEFT\r
- MENUITEM "with &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR\r
+ MENUITEM "With &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR\r
MENUITEM "&With...", ID_DIR_OPEN_LEFT_WITH\r
MENUITEM "Open &Parent Folder...", ID_DIR_OPEN_LEFT_PARENT_FOLDER\r
END\r
POPUP "Open Midd&le"\r
BEGIN\r
MENUITEM "With &Registered Application", ID_DIR_OPEN_MIDDLE\r
- MENUITEM "with &External Editor", ID_DIR_OPEN_MIDDLE_WITHEDITOR\r
+ MENUITEM "With &External Editor", ID_DIR_OPEN_MIDDLE_WITHEDITOR\r
MENUITEM "&With...", ID_DIR_OPEN_MIDDLE_WITH\r
MENUITEM "Open &Parent Folder...", ID_DIR_OPEN_MIDDLE_PARENT_FOLDER\r
END\r
POPUP "O&pen Right"\r
BEGIN\r
MENUITEM "With &Registered Application", ID_DIR_OPEN_RIGHT\r
- MENUITEM "with &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR\r
+ MENUITEM "With &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR\r
MENUITEM "&With...", ID_DIR_OPEN_RIGHT_WITH\r
MENUITEM "Open &Parent Folder...", ID_DIR_OPEN_RIGHT_PARENT_FOLDER\r
END\r
MENUITEM "Left Shell menu", ID_DIR_SHELL_CONTEXT_MENU_LEFT\r
MENUITEM "Middle Shell menu", ID_DIR_SHELL_CONTEXT_MENU_MIDDLE\r
MENUITEM "Right Shell menu", ID_DIR_SHELL_CONTEXT_MENU_RIGHT\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "&File Encoding...", ID_FILE_ENCODING\r
END\r
POPUP "_HDR_POPUP_"\r
BEGIN\r
END\r
END\r
\r
+IDR_POPUP_SAVE MENU\r
+BEGIN\r
+ POPUP "_POPUP_"\r
+ BEGIN\r
+ MENUITEM "Save &Left", ID_FILE_SAVE_LEFT\r
+ MENUITEM "Save &Middle", ID_FILE_SAVE_MIDDLE\r
+ MENUITEM "Save &Right", ID_FILE_SAVE_RIGHT\r
+ MENUITEM SEPARATOR\r
+ MENUITEM "Save &Left As...", ID_FILE_SAVEAS_LEFT\r
+ MENUITEM "Save &Middle As...", ID_FILE_SAVEAS_MIDDLE\r
+ MENUITEM "Save &Right As...", ID_FILE_SAVEAS_RIGHT\r
+ END\r
+END\r
+\r
IDR_POPUP_MERGEEDITFRAME_STATUSBAR_EOL MENU\r
BEGIN\r
POPUP "_POPUP_"\r
VK_DOWN, ID_NEXTCONFLICT, VIRTKEY, SHIFT, ALT, NOINVERT\r
VK_F8, ID_NEXTDIFF, VIRTKEY, NOINVERT\r
VK_F8, ID_NEXTCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
+ VK_F8, ID_NEXTFILE, VIRTKEY, CONTROL, NOINVERT\r
VK_F7, ID_PREVDIFF, VIRTKEY, NOINVERT\r
VK_F7, ID_PREVCONFLICT, VIRTKEY, SHIFT, NOINVERT\r
+ VK_F7, ID_PREVFILE, VIRTKEY, CONTROL, NOINVERT\r
VK_END, ID_LASTDIFF, VIRTKEY, ALT, NOINVERT\r
VK_F2, ID_DIR_ITEM_RENAME, VIRTKEY, NOINVERT\r
VK_F3, ID_EDIT_REPEAT, VIRTKEY, SHIFT, NOINVERT\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,240,10\r
CONTROL "Close ""Select Files or Folders"" Dialog on clicking OK button",IDC_CLOSE_WITH_OK,\r
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,131,240,10\r
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,7,145,240,10\r
+ LTEXT "Op&en-dialog Auto-Completion:",IDC_STATIC,7,145,240,10\r
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,7,159,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
LTEXT "Language:",IDC_STATIC,7,175,240,10\r
COMBOBOX IDC_LANGUAGE_LIST,7,187,240,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,161,228,88,14,NOT WS_TABSTOP\r
END\r
\r
-IDD_EDIT_FIND DIALOGEX 30, 73, 305, 96\r
+IDD_EDIT_FIND DIALOGEX 30, 73, 324, 96\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Find"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
- LTEXT "Fi&nd what:",IDC_STATIC,7,9,60,10\r
- COMBOBOX IDC_EDIT_FINDTEXT,69,7,150,65,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
+ LTEXT "Fi&nd what:",IDC_STATIC,7,9,70,10\r
+ COMBOBOX IDC_EDIT_FINDTEXT,80,7,160,65,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
CONTROL "Match &whole word only",IDC_EDIT_WHOLE_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,24,140,10\r
CONTROL "Match &case",IDC_EDIT_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,140,10\r
CONTROL "Regular &expression",IDC_EDIT_REGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,140,10\r
CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,200,10\r
CONTROL "&Don't close this dialog box",IDC_FINDDLG_DONTCLOSE,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,200,10\r
- DEFPUSHBUTTON "&Find Next",IDOK,226,7,72,14,WS_GROUP\r
- PUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,226,24,72,14,WS_GROUP\r
- PUSHBUTTON "Cancel",IDCANCEL,226,41,72,14\r
+ DEFPUSHBUTTON "&Find Next",IDOK,247,7,70,14,WS_GROUP\r
+ PUSHBUTTON "Find &Prev",IDC_EDIT_FINDPREV,247,24,70,14,WS_GROUP\r
+ PUSHBUTTON "Cancel",IDCANCEL,247,41,70,14\r
END\r
\r
IDD_DIR_FILTER DIALOGEX 30, 73, 293, 74\r
PUSHBUTTON "Cancel",IDCANCEL,240,154,50,14\r
END\r
\r
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 530, 176\r
+IDD_FILTERS_LINEFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
CAPTION "Line Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,115,156,50,14\r
END\r
\r
-IDD_IGNORED_SUSBSTITUTIONS_DLG DIALOGEX 0, 0, 530, 176\r
+IDD_FILTERS_SUBSTITUTIONFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
CAPTION "Substitution Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Cancel",IDCANCEL,275,143,50,14\r
END\r
\r
-IDD_SELECTUNPACKER DIALOGEX 0, 0, 318, 102\r
+IDD_PLUGINS_SELECTUNPACKER DIALOGEX 0, 0, 318, 102\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Select Unpacker"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
END\r
\r
-IDD_FILEFILTERS DIALOGEX 0, 0, 530, 176\r
+IDD_FILTERS_FILEFILTERS DIALOGEX 0, 0, 530, 176\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "File Filters"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
GROUPBOX "Default Codepage",IDC_STATIC,7,7,241,93\r
LTEXT "Select the default codepage assumed when loading non-Unicode files:",IDC_STATIC,14,18,228,20\r
- CONTROL "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session.",IDC_DETECT_CODEPAGE,\r
+ CONTROL "Detect codepage info for these type of files: .html, .rc, .xml\nNeed to restart session.",IDC_DETECT_CODEPAGE,\r
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,105,230,30\r
- CONTROL "Detect codepage for text files using mlang.dll\nNeed to restart session.",IDC_DETECT_CODEPAGE2,\r
+ CONTROL "Detect codepage for text files with mlang.dll\nNeed to restart session.",IDC_DETECT_CODEPAGE2,\r
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,13,139,230,34\r
COMBOBOX IDC_DETECT_AUTODETECTTYPE,23,175,217,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
CONTROL "System codepage",IDC_CP_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,42,230,10\r
PUSHBUTTON "Cancel",IDCANCEL,211,76,50,14\r
END\r
\r
-IDD_SHARED_FILTER DIALOGEX 0, 0, 250, 75\r
+IDD_FILTERS_FILEFILTERS_SHARED DIALOGEX 0, 0, 250, 75\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Shared or Private Filter"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "Cancel",IDCANCEL,135,55,50,14\r
END\r
\r
-IDD_PROP_ARCHIVE DIALOGEX 0, 0, 255, 126\r
+IDD_PROPPAGE_ARCHIVE DIALOGEX 0, 0, 255, 126\r
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Archive Support"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
PUSHBUTTON "&Cancel",IDCANCEL,221,141,50,14\r
END\r
\r
-IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142\r
+IDD_FILTERS_FILEFILTERS_TEST DIALOGEX 0, 0, 249, 142\r
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION\r
CAPTION "Test Filter"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
END\r
\r
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 115\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
CAPTION "Confirm Copy"\r
FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
BEGIN\r
EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL | ES_READONLY\r
LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,10\r
EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL | ES_READONLY\r
- CONTROL "Don't ask this &question again.",IDC_FLDCONFIRM_DONTASKAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,81,232,10\r
+ CONTROL "Don't ask this &question again.",IDC_FLDCONFIRM_DONTASKAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,81,232,10\r
DEFPUSHBUTTON "Yes",IDYES,174,95,50,14\r
PUSHBUTTON "No",IDNO,228,95,50,14\r
END\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,36,239,10\r
CONTROL "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,48,239,10\r
- CONTROL "&Include unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
+ CONTROL "Include &unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,\r
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,60,239,10\r
CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,72,239,10\r
CONTROL "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,\r
BEGIN\r
END\r
\r
- IDD_PROPPAGE_FILTER, DIALOG\r
+ IDD_FILTERS_LINEFILTERS, DIALOG\r
BEGIN\r
END\r
\r
- IDD_IGNORED_SUSBSTITUTIONS_DLG, DIALOG\r
+ IDD_FILTERS_SUBSTITUTIONFILTERS, DIALOG\r
BEGIN\r
BOTTOMMARGIN, 196\r
END\r
BEGIN\r
END\r
\r
- IDD_FILEFILTERS, DIALOG\r
+ IDD_FILTERS_FILEFILTERS, DIALOG\r
BEGIN\r
END\r
\r
BEGIN\r
END\r
\r
- IDD_PROP_ARCHIVE, DIALOG\r
+ IDD_PROPPAGE_ARCHIVE, DIALOG\r
BEGIN\r
END\r
\r
0, 0, 100, 0,\r
0, 0, 0, 0,\r
0, 0, 100, 0,\r
+ 0, 0, 0, 0\r
100, 0, 0, 0,\r
100, 0, 0, 0,\r
- 0, 0, 0, 0\r
END\r
\r
IDD_DIALOG_WINDOWSMANAGER AFX_DIALOG_LAYOUT\r
100, 0, 0, 0\r
END\r
\r
-IDD_PROP_ARCHIVE AFX_DIALOG_LAYOUT\r
+IDD_PROPPAGE_ARCHIVE AFX_DIALOG_LAYOUT\r
BEGIN\r
0,\r
0, 0, 100, 0,\r
0, 0, 100, 0\r
END\r
\r
-IDD_FILEFILTERS AFX_DIALOG_LAYOUT\r
+IDD_FILTERS_FILEFILTERS AFX_DIALOG_LAYOUT\r
BEGIN\r
0\r
END\r
\r
-IDD_PROPPAGE_FILTER AFX_DIALOG_LAYOUT\r
+IDD_FILTERS_LINEFILTERS AFX_DIALOG_LAYOUT\r
BEGIN\r
0\r
END\r
"Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"\r
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"\r
IDS_LINE_STATUS_INFO "Ln: %s Col: %d/%d Ch: %d/%d"\r
+ IDS_LINE_STATUS_INFO_SEL " Sel: %d | %d"\r
IDS_MERGEMODE_MERGING "Merge"\r
IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2"\r
IDS_NO_DIFF_SEL_FMT "%1 Differences Found"\r
IDS_MOVE_TO_PREVFILE "Do you want to move to the previous file?"\r
IDS_MOVE_TO_NEXTPAGE "Do you want to move to the next page?"\r
IDS_MOVE_TO_PREVPAGE "Do you want to move to the previous page?"\r
+ IDS_MOVE_TO_FIRSTFILE "Do you want to move to the first file?"\r
+ IDS_MOVE_TO_LASTFILE "Do you want to move to the last file?"\r
END\r
\r
// Encoding issues\r
ID_ALL_LEFT "\nAll Left"\r
ID_AUTO_MERGE "\nAuto Merge (Ctrl+Alt+M)"\r
ID_FIRSTFILE "\nFirst File"\r
- ID_NEXTFILE "\nNext File"\r
+ ID_NEXTFILE "\nNext File (Ctrl+F8)"\r
ID_LASTFILE "\nLast File"\r
- ID_PREVFILE "\nPrevious File"\r
+ ID_PREVFILE "\nPrevious File (Ctrl+F7)"\r
\r
END\r
\r
OSDN Git Service
