Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Akos Keresztes 2020-03-12 18:08:23 +01:00
commit a96caae7ee
5 changed files with 7 additions and 7 deletions

View File

@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
=====================================================
Current RC3 Version 5.20.311.(build_#) (2020-03-11)
Current RC3 Version 5.20.312.(build_#) (2020-03-12)
// Version 5.20.3xx.x (xx March 2020)
=====================================================

View File

@ -1 +1 @@
1
2

View File

@ -363,7 +363,7 @@ BEGIN
MENUITEM "允许滚动超过文件尾(&S)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "显示超链接提示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "P&anels(&A)"
POPUP "面板(&A)"
BEGIN
MENUITEM "显示菜单栏(&M)", IDM_VIEW_MENUBAR
MENUITEM "显示工具栏(&T)", IDM_VIEW_TOOLBAR
@ -372,7 +372,7 @@ BEGIN
MENUITEM "加载工具栏主题(&L)...", IDM_VIEW_LOADTHEMETB
MENUITEM "自定义工具栏(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "切换工具栏(&G)", IDM_VIEW_TOGGLETB
MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB
MENUITEM "DPI 自适应(&D)", IDM_VIEW_DPISCALETB
END
POPUP "缩放(&Z)"
BEGIN
@ -509,7 +509,7 @@ BEGIN
MENUITEM "加载工具栏主题(&L)...", IDM_VIEW_LOADTHEMETB
MENUITEM "自定义工具栏(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "切换工具栏(&G)", IDM_VIEW_TOGGLETB
MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB
MENUITEM "DPI 自适应(&D)", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.312.1"
version="5.20.312.2"
type="win32"
/>
<description>Notepad3 RC3</description>

View File

@ -9,7 +9,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 312
#define VERSION_BUILD 1
#define VERSION_BUILD 2
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27