From 70ea6531eb10a382329014a1f93c6cc22b072617 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 11 Mar 2019 13:16:25 +0100 Subject: [PATCH] MUI - Chinese (zh-CN) translation correction (suite.2) - Correction from: "lenny20" --- Build/Changes.txt | 10 ++- language/np3_zh_cn/dialogs_zh_cn.rc | 108 ++++++++++++++-------------- language/np3_zh_cn/menu_zh_cn.rc | 36 +++++----- 3 files changed, 81 insertions(+), 73 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index a677447fa..4d5f8a5aa 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -36,6 +36,9 @@ Current Version 5.19.309.build (2019-Mar-09) -------------------------------------------------- NEW: -------------------------------------------------- + +- Add a timer of 3.2 second to the Zoom bubbles popup + - Add (internal) [Settings2] to control encoding detection - Add Recent History button in Toolbar - Add support for external and internal Hot- and Disabled- Toolbar icons @@ -56,6 +59,9 @@ NEW: -------------------------------------------------- CHANGES: -------------------------------------------------- + +- Add here items for review... + - Rework Chinese encoding (GBK,GB2312,GB18030) detection and selection - Make international language menu (language independent) - Start dual encoding detectors in (thread) parallel for large files @@ -79,6 +85,9 @@ CHANGES: -------------------------------------------------- FIXES: -------------------------------------------------- + +- Add here items for review... + - Broken open hyperlink in web-browser (Ctrl+Click) and broken toolbar toggle - MUI - Replace Horizontal Ellipsis by 3 final point (ANSI Detection Issue) - Write Language change to Settings2 on change immediately @@ -93,7 +102,6 @@ FIXES: -------------------------------------------------- TRANSLATIONS (MUI): -------------------------------------------------- -- Portuguese (pt-BR) Translation (In progress) - Hungarian (hu-HU) Translation (In progress) - Italian (it-IT) Translation (Partial) - Korean (UHC) Translation diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index 6616aadb5..85a8897cc 100644 --- a/language/np3_zh_cn/dialogs_zh_cn.rc +++ b/language/np3_zh_cn/dialogs_zh_cn.rc @@ -79,72 +79,72 @@ BEGIN EDITTEXT IDC_CMDLINEHELP, 15, 7, 278, 176, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER END -IDD_MUI_FIND DIALOGEX 0, 0, 273, 142 +IDD_MUI_FIND DIALOGEX 0, 0, 309, 142 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "查找" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "查找内容(&G)：",IDC_STATIC,7,7,46,8 - COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "大小写敏感(&C)",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10 - CONTROL "全词匹配(&W)",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10 - CONTROL "仅匹配词首(&B)",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 - CONTROL "转义反斜杠(&T)",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10 - CONTROL "使用正则表达式(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10 - CONTROL ". 匹配所有(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10 - CONTROL "不要循环查找(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10 - CONTROL "找到后关闭(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10 - CONTROL "标记匹配(&O)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,73,10 - CONTROL "使用通配符(&I)",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,63,10 - CONTROL "当失去焦点时透明(&T)",IDC_TRANSPARENT, - "Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,118,124,10 - DEFPUSHBUTTON "查找下一个(&F)",IDOK,211,7,55,14 - PUSHBUTTON "查找上一个(&P)",IDC_FINDPREV,211,24,55,14 - PUSHBUTTON "关闭",IDCANCEL,211,99,55,14 + COMBOBOX IDC_FINDTEXT,7,17,221,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "大小写敏感(&C)",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,107,10 + CONTROL "全词匹配(&W)",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,107,10 + CONTROL "仅匹配词首(&B)",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,107,10 + CONTROL "转义反斜杠(&T)",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,95,10 + CONTROL "使用正则表达式(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,95,10 + CONTROL ". 匹配换行符(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,96,10 + CONTROL "不要循环查找(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,103,10 + CONTROL "查找后关闭(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,103,10 + CONTROL "标记匹配(&O)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,103,10 + CONTROL "使用通配符(&I)",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,79,10 + CONTROL "当失去焦点时透明(&T)", IDC_TRANSPARENT, + "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 118, 124, 10 + DEFPUSHBUTTON "查找下一个(&F)",IDOK,234,6,67,14 + PUSHBUTTON "查找上一个(&P)",IDC_FINDPREV,234,24,67,14 + PUSHBUTTON "关闭",IDCANCEL,234,96,67,14 CONTROL "切换到“替换” (Ctrl+H)",IDC_TOGGLEFINDREPLACE, - "SysLink",0x0,125,103,74,10 + "SysLink",0x0,125,103,94,10 CONTROL "(?)",IDC_REGEXPHELP,"SysLink",0x0,106,85,14,10 CONTROL "(?)",IDC_BACKSLASHHELP,"SysLink",0x0,106,73,14,10 - CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 - CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE - PUSHBUTTON "仅显示匹配行(&V)",IDC_TOGGLE_VISIBILITY,211,65,55,14 + CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,210,84,14,10 + CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,293,9,WS_EX_STATICEDGE + PUSHBUTTON "仅显示匹配行(&V)",IDC_TOGGLE_VISIBILITY,234,78,67,14 END -IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 +IDD_MUI_REPLACE DIALOGEX 0, 0, 309, 168 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "替换" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "查找内容(&G)：",IDC_STATIC,7,7,46,8 - COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FINDTEXT,7,17,221,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "替换为(&H)：",IDC_STATIC,7,36,44,8 - COMBOBOX IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "大小写敏感(&C)",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10 - CONTROL "全词匹配(&W)",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10 - CONTROL "仅匹配词首(&B)",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10 - CONTROL "转义反斜杠(&T)",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 - CONTROL "使用正则表达式(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10 - CONTROL ". 匹配所有(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10 - CONTROL "不要循环查找(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 - CONTROL "替换后关闭(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10 - CONTROL "标记匹配(&O)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10 - CONTROL "使用通配符(&I)",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,63,10 - CONTROL "当失去焦点时透明(&T)",IDC_TRANSPARENT, - "Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,144,124,10 - DEFPUSHBUTTON "查找下一个(&F)",IDOK,211,7,55,14 - PUSHBUTTON "查找上一个(&P)",IDC_FINDPREV,211,23,55,14 - PUSHBUTTON "替换(&R)",IDC_REPLACE,211,43,55,14 - PUSHBUTTON "在选区中替换(&S)",IDC_REPLACEINSEL,211,59,55,14 - PUSHBUTTON "全部替换(&A)",IDC_REPLACEALL,211,75,55,14 - PUSHBUTTON "交换查找和替换(&X)",IDC_SWAPSTRG,135,32,64,12 - PUSHBUTTON "关闭",IDCANCEL,211,126,55,14 + COMBOBOX IDC_REPLACETEXT,7,47,221,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "大小写敏感(&C)",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,107,10 + CONTROL "全词匹配(&W)",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,107,10 + CONTROL "仅匹配词首(&B)",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,107,10 + CONTROL "转义反斜杠(&T)",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,95,10 + CONTROL "使用正则表达式(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,95,10 + CONTROL ". 匹配换行符(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,96,10 + CONTROL "不要循环查找(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,103,10 + CONTROL "替换后关闭(&L)",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,103,10 + CONTROL "标记匹配(&O)",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,103,10 + CONTROL "使用通配符(&I)",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,79,10 + CONTROL "当失去焦点时透明(&T)", IDC_TRANSPARENT, + "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 144, 124, 10 + DEFPUSHBUTTON "查找下一个(&F)",IDOK,234,6,67,14 + PUSHBUTTON "查找上一个(&P)",IDC_FINDPREV,234,24,67,14 + PUSHBUTTON "替换(&R)",IDC_REPLACE,234,42,67,14 + PUSHBUTTON "在选区中替换(&S)",IDC_REPLACEINSEL,234,60,67,14 + PUSHBUTTON "全部替换(&A)",IDC_REPLACEALL,234,78,67,14 + PUSHBUTTON "交换查找和替换(&X)",IDC_SWAPSTRG,120,32,102,12 + PUSHBUTTON "关闭",IDCANCEL,234,126,67,14 CONTROL "切换到“查找” (Ctrl+F)",IDC_TOGGLEFINDREPLACE, - "SysLink",0x0,125,130,74,10 + "SysLink",0x0,125,130,94,10 CONTROL "(?)",IDC_BACKSLASHHELP,"SysLink",0x0,107,102,14,10 CONTROL "(?)",IDC_REGEXPHELP,"SysLink",0x0,107,114,14,10 - CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 - CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE - PUSHBUTTON "仅显示匹配行(&V)",IDC_TOGGLE_VISIBILITY,211,94,55,14 + CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,210,114,14,10 + CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,293,9,WS_EX_STATICEDGE + PUSHBUTTON "仅显示匹配行(&V)",IDC_TOGGLE_VISIBILITY,234,108,67,14 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -167,7 +167,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_OPENWITHDIR,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,69 PUSHBUTTON "",IDC_GETOPENWITHDIR,7,83,13,13 - LTEXT "点击此处指定链接目录到偏好的应用程序。",IDC_OPENWITHDESCR,26,83,132,18 + LTEXT "单击这里设置用于收藏应用程序的文件夹。",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "确定",IDOK,52,108,50,14 PUSHBUTTON "取消",IDCANCEL,108,108,50,14 SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 @@ -183,17 +183,17 @@ BEGIN CONTROL "作为编码检测失败的后备方案(&F)",IDC_USEASREADINGFALLBACK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,38,166,10 GROUPBOX "编码检测",IDC_STATIC,7,58,183,88,0,WS_EX_TRANSPARENT - CONTROL "用 UTF-8 模式打开 7-bit &ASCII",IDC_ASCIIASUTF8, + CONTROL "用 UTF-8 模式打开 7-bit ASCII(&M)",IDC_ASCIIASUTF8, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,70,166,10 CONTROL "仅使用可靠的检测结果(&R)", IDC_RELIABLE_DETECTION_RES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 - CONTROL "用 DOS-437 模式打开 .&nfo 和 .diz 文件",IDC_NFOASOEM, + CONTROL "用 DOS-437 模式打开 .nfo 和 .diz 文件(&N)",IDC_NFOASOEM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,166,10 CONTROL "不要分析编码标记(&T)",IDC_ENCODINGFROMFILEVARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,166,10 - CONTROL "跳过 &ANSI 代码页检测",IDC_NOANSICPDETECTION, + CONTROL "跳过 ANSI 代码页检测(&A)",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,166,10 - CONTROL "跳过 &Unicode 检测",IDC_NOUNICODEDETECTION, + CONTROL "跳过 Unicode 检测(&U)",IDC_NOUNICODEDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,166,10 DEFPUSHBUTTON "确定",IDOK,87,151,50,14 PUSHBUTTON "取消",IDCANCEL,140,151,50,14 @@ -210,7 +210,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,40,186,10 CONTROL "保存文件时确保一致的换行符(&E)",IDC_CONSISTENT_EOLS, "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,52,182,10 - CONTROL "保存时删除行尾空格(&S)",IDC_AUTOSTRIPBLANKS, + CONTROL "保存时删除行尾空白字符(&S)",IDC_AUTOSTRIPBLANKS, "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,7,64,173,10 DEFPUSHBUTTON "确定",IDOK,139,7,50,14 PUSHBUTTON "取消",IDCANCEL,139,24,50,14 @@ -554,7 +554,7 @@ BEGIN CONTROL "删除空行(&E)",106,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,86,167,10 CONTROL "删除只有空格的行(&W)",107,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,167,10 CONTROL "大小写不敏感(&C)",108,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,115,167,10 - CONTROL "逻辑数字比较(&N)",109,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,167,10 + CONTROL "数值逻辑比较(&N)",109,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,167,10 CONTROL "比较矩形选定区域(&S)",110,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,167,10 DEFPUSHBUTTON "确定",IDOK,128,7,50,14 PUSHBUTTON "取消",IDCANCEL,128,24,50,14 diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 6e21d5873..1c70171a5 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -75,8 +75,8 @@ BEGIN MENUITEM "打开方式(&O)...\tAlt+L", IDM_FILE_OPENWITH MENUITEM "命令(&C)...\tCtrl+R", IDM_FILE_RUN MENUITEM SEPARATOR - MENUITEM "Web 模板 &1\tCtrl+Shift+1", CMD_WEBACTION1 - MENUITEM "Web 模板 &2\tCtrl+Shift+2", CMD_WEBACTION2 + MENUITEM "Web 模板 1(&1)\tCtrl+Shift+1", CMD_WEBACTION1 + MENUITEM "Web 模板 2(&2)\tCtrl+Shift+2", CMD_WEBACTION2 END MENUITEM SEPARATOR POPUP "编码(&E)" @@ -90,10 +90,10 @@ BEGIN MENUITEM SEPARATOR MENUITEM "强制检测编码(&M)", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR - MENUITEM "重载为默认编码(&E)\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "重载为 &ANSI 编码\tCtrl-Shift+A", CMD_RECODEANSI - MENUITEM "重载为 &OEM 编码\tCtrl+Shift+O", CMD_RECODEOEM - MENUITEM "重载为 &GB18030 编码\tCtrl+Shift+F10", CMD_RECODEGB18030 + MENUITEM "重新编码为默认(&E)\tCtrl-Alt-F", CMD_RECODEDEFAULT + MENUITEM "重新编码为 &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "重新编码为 &OEM\tCtrl+Shift+O", CMD_RECODEOEM + MENUITEM "重新编码为 &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM SEPARATOR MENUITEM "重载 ASCII 为 UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 MENUITEM "忽略编码标记(&T)\tAlt+F8", CMD_RELOADNOFILEVARS @@ -101,7 +101,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "设置默认(&D)...", IDM_ENCODING_SETDEFAULT END - POPUP "行末(&G)" + POPUP "换行(&G)" BEGIN MENUITEM "&Windows (CR+LF)", IDM_LINEENDINGS_CRLF MENUITEM "&Mac (CR)", IDM_LINEENDINGS_CR @@ -137,7 +137,7 @@ BEGIN MENUITEM "全部复制(&L)\tAlt+C", IDM_EDIT_COPYALL MENUITEM "增量复制(&Y)\tCtrl+E", IDM_EDIT_COPYADD MENUITEM "粘贴(&P)\tCtrl+V", IDM_EDIT_PASTE - MENUITEM "交换剪贴板(&W)\tCtrl+K", IDM_EDIT_SWAP + MENUITEM "与剪贴板交换(&W)\tCtrl+K", IDM_EDIT_SWAP MENUITEM "删除(&D)\tDel", IDM_EDIT_CLEAR MENUITEM "清空剪贴板(&E)", IDM_EDIT_CLEARCLIPBOARD MENUITEM "全选(&A)\tCtrl+A", IDM_EDIT_SELECTALL @@ -167,14 +167,14 @@ BEGIN MENUITEM SEPARATOR MENUITEM "硬换行处理(&W)...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP MENUITEM "拆分行(&S)\tCtrl+I", IDM_EDIT_SPLITLINES - MENUITEM "合并行（用空格隔开）(&J)\tCtrl+J", IDM_EDIT_JOINLINES - MENUITEM "合并行（不添加空格）(&F)\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP - MENUITEM "合并行（保留段落）(&P)\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA + MENUITEM "拼接行（用空格隔开）(&J)\tCtrl+J", IDM_EDIT_JOINLINES + MENUITEM "拼接行（不添加空格）(&F)\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP + MENUITEM "拼接行（保留段落）(&P)\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA MENUITEM SEPARATOR MENUITEM "合并空行(&G)\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES - MENUITEM "合并只有空格的行(&N)\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES + MENUITEM "合并只有空白字符的行(&N)\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES MENUITEM "删除空行(&R)\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "删除只有空格的行(&M)\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "删除只有空白字符的行(&M)\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "删除重复行(&O)\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "选择(&S)" @@ -201,7 +201,7 @@ BEGIN MENUITEM "删除第一个字符(&F)\tAlt+Z", IDM_EDIT_STRIP1STCHAR MENUITEM "删除最后一个字符(&L)\tAlt+U", IDM_EDIT_STRIPLASTCHAR MENUITEM "删除行尾空格(&T)\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "压缩空格(&W)\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "压缩空白字符(&W)\tAlt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR MENUITEM "修改(&M)...\tAlt+M", IDM_EDIT_MODIFYLINES MENUITEM "对齐(&A)...\tAlt+J", IDM_EDIT_ALIGN @@ -253,8 +253,8 @@ BEGIN MENUITEM "转换为十六进制(&C)\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX MENUITEM "从十六进制转换(&H)\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR MENUITEM SEPARATOR - MENUITEM "增加数值(&+)\tCtrl+Alt+NK+", CMD_INCREASENUM - MENUITEM "减少数值(&+)\tCtrl+Alt+NK-", CMD_DECREASENUM + MENUITEM "增大数值(&+)\tCtrl+Alt+NK+", CMD_INCREASENUM + MENUITEM "减小数值(&+)\tCtrl+Alt+NK-", CMD_DECREASENUM MENUITEM SEPARATOR MENUITEM "查找配对的括号(&F)\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE MENUITEM "选定直到配对的括号(&M)\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE @@ -303,7 +303,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "显示软换行(&P)\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS MENUITEM "显示空格(&W)\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS - MENUITEM "显示行末符号(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS + MENUITEM "显示换行符号(&E)\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR MENUITEM "检测超链接(&Y)\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "提示配对括号(&V)\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES @@ -336,7 +336,7 @@ BEGIN MENUITEM "代码折叠(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING MENUITEM "切换折叠(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM "切换聚焦(&V)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "追踪文件末尾（&Tail 命令）", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "追踪文件末尾（&tail 命令）", IDM_VIEW_CHASING_DOCTAIL MENUITEM "允许滚动超过文件尾(&F)", IDM_VIEW_SCROLLPASTEOF END POPUP "工具栏(&T)"