CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_UCHARDET

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-03-11 17:48:03 +01:00
commit 6d50e12394
5 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Build/Changes.txt
View File

@ -37,7 +37,7 @@ Current Version 5.19.309.build (2019-Mar-09)
NEW:
--------------------------------------------------
- Add a timer of 3.2 second to the Zoom bubbles popup
- Add a timer of 3.2 second to the Zoom Info Bubble
- Add (internal) [Settings2] to control encoding detection
- Add Recent History button in Toolbar
@ -60,7 +60,7 @@ NEW:
CHANGES:
--------------------------------------------------
- Add here items for review...
- Add here items for later review...
- Rework Chinese encoding (GBK,GB2312,GB18030) detection and selection
- Make international language menu (language independent)
@ -86,7 +86,7 @@ CHANGES:
FIXES:
--------------------------------------------------
- Add here items for review...
- Add here items for later review...
- Broken open hyperlink in web-browser (Ctrl+Click) and broken toolbar toggle
- MUI - Replace Horizontal Ellipsis by 3 final point (ANSI Detection Issue)

1
language/common_res.rc
View File

@ -111,6 +111,7 @@ IDS_MUI_ABOUT_ACKNOWLEDGES "\
\\cf0 craigo-\\tab https://github.com/craigo-/\\par\
\\cf0 engelhro\\tab https://github.com/engelhro\\par\
\\cf0 hpwamr\\tab https://github.com/hpwamr\\par\
\\cf0 jczanfona\\tab https://github.com/jczanfona\\par\
\\cf0 lhmouse\\tab https://github.com/lhmouse\\par\
\\cf0 maboroshin\\tab https://github.com/maboroshin\\par\
\\cf0 RaffaeleBianc0\\tab https://github.com/RaffaeleBianc0\\par\

6
language/np3_es_es/menu_es_es.rc
View File

@ -396,9 +396,9 @@ BEGIN
BEGIN
POPUP "Mostrar en el &título de la ventana"
BEGIN
MENUITEM "&Solo nombre de archivo", IDM_VIEW_SHOWFILENAMEONLY
MENUITEM "&Solo el nombre del archivo", IDM_VIEW_SHOWFILENAMEONLY
MENUITEM "&Nombre de archivo y carpeta", IDM_VIEW_SHOWFILENAMEFIRST
MENUITEM "Nombre de la &ruta completa", IDM_VIEW_SHOWFULLPATH
MENUITEM "Nombre de la &ruta completa", IDM_VIEW_SHOWFULLPATH
MENUITEM "&Extracto de texto\tCtrl+9", IDM_VIEW_SHOWEXCERPT
END
MENUITEM "&Reutilizar la ventana", IDM_VIEW_REUSEWINDOW
@ -448,7 +448,7 @@ BEGIN
MENUITEM "&Deshacer", IDM_EDIT_UNDO
MENUITEM "&Rehacer", IDM_EDIT_REDO
MENUITEM SEPARATOR
MENUITEM "Cor&ta", IDM_EDIT_CUT
MENUITEM "Cor&tar", IDM_EDIT_CUT
MENUITEM "&Copiar", IDM_EDIT_COPY
MENUITEM "&Pegar", IDM_EDIT_PASTE
MENUITEM "&Eliminar", IDM_EDIT_CLEAR

96
language/np3_zh_cn/dialogs_zh_cn.rc
View File

@ -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, 309, 142
IDD_MUI_FIND DIALOGEX 0, 0, 273, 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,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
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
CONTROL "<a>切换到“替换” (Ctrl+H)</a>",IDC_TOGGLEFINDREPLACE,
"SysLink",0x0,125,103,94,10
"SysLink",0x0,125,103,74,10
CONTROL "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,106,85,14,10
CONTROL "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,106,73,14,10
CONTROL "<a>(?)</a>",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
CONTROL "<a>(?)</a>",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
END
IDD_MUI_REPLACE DIALOGEX 0, 0, 309, 168
IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 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,221,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "替换为(&H)：",IDC_STATIC,7,36,44,8
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
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
CONTROL "<a>切换到“查找” (Ctrl+F)</a>",IDC_TOGGLEFINDREPLACE,
"SysLink",0x0,125,130,94,10
"SysLink",0x0,125,130,74,10
CONTROL "<a>(?)</a>",IDC_BACKSLASHHELP,"SysLink",0x0,107,102,14,10
CONTROL "<a>(?)</a>",IDC_REGEXPHELP,"SysLink",0x0,107,114,14,10
CONTROL "<a>(?)</a>",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
CONTROL "<a>(?)</a>",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
END
IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@ -183,7 +183,7 @@ 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(&M)",IDC_ASCIIASUTF8,
CONTROL "用 UTF-8 模式打开 7 位 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

24
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -81,21 +81,21 @@ BEGIN
MENUITEM SEPARATOR
POPUP "编码(&E)"
BEGIN
MENUITEM "&ANSI", IDM_ENCODING_ANSI
MENUITEM "&Unicode", IDM_ENCODING_UNICODE
MENUITEM "Unicode &BE", IDM_ENCODING_UNICODEREV
MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8
MENUITEM "UTF-8 &Sig", IDM_ENCODING_UTF8SIGN
MENUITEM "ANSI(&A)", IDM_ENCODING_ANSI
MENUITEM "Unicode(&U)", IDM_ENCODING_UNICODE
MENUITEM "Unicode BE(&B)", IDM_ENCODING_UNICODEREV
MENUITEM "UTF-8(&8)\tShift+F8", IDM_ENCODING_UTF8
MENUITEM "UTF-8 带签名(&S)", IDM_ENCODING_UTF8SIGN
MENUITEM "更多编码(&M)...\tF9", IDM_ENCODING_SELECT
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 "重新编码为 ANSI(&A)\tCtrl-Shift+A", CMD_RECODEANSI
MENUITEM "重新编码为 OEM(&O)\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "重新编码为 GB18030(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030
MENUITEM SEPARATOR
MENUITEM "重载 ASCII 为 UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
MENUITEM "重载 ASCII 为 UTF-8(&8)\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
MENUITEM "忽略编码标记(&T)\tAlt+F8", CMD_RELOADNOFILEVARS
MENUITEM "选择编码(&R)...\tF8", IDM_ENCODING_RECODE
MENUITEM SEPARATOR
@ -103,9 +103,9 @@ BEGIN
END
POPUP "换行(&G)"
BEGIN
MENUITEM "&Windows (CR+LF)", IDM_LINEENDINGS_CRLF
MENUITEM "&Mac (CR)", IDM_LINEENDINGS_CR
MENUITEM "&Unix (LF)", IDM_LINEENDINGS_LF
MENUITEM "Windows (CR+LF) (&W)", IDM_LINEENDINGS_CRLF
MENUITEM "Mac (CR) (&M)", IDM_LINEENDINGS_CR
MENUITEM "Unix (LF) (&U)", IDM_LINEENDINGS_LF
MENUITEM SEPARATOR
MENUITEM "默认(&D)...", IDM_LINEENDINGS_SETDEFAULT
END