From 5c2dac55d665136252ffeea7cc3eab4218a05099 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 14 Apr 2020 23:26:06 +0200 Subject: [PATCH] MUI - Minor correction to layout in pl-PL +ver: VS2019 version update - VS 16.5.4 + upd: Versioning files --- Build/Changes.txt | 2 +- Versions/build.txt | 2 +- Versions/day.txt | 2 +- language/np3_pl_pl/dialogs_pl_pl.rc | 4 ++-- res/Notepad3.exe.manifest.conf | 2 +- src/Version.h | 4 +++- src/VersionEx.h | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index c10eb0053..b76993968 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -32,7 +32,7 @@ GRE - (GRE)pWinNP3 Search in Files Tool ===================================================== -Current BETA Version 5.20.413.(build_#) (2020-04-13) +Current BETA Version 5.20.414.(build_#) (2020-04-14) ===================================================== ----------------------------------------------------- diff --git a/Versions/build.txt b/Versions/build.txt index 00750edc0..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -3 +2 diff --git a/Versions/day.txt b/Versions/day.txt index 36352541c..d1b9f6a9c 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -413 +414 diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index b46d9e79f..d48385920 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -262,9 +262,9 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,255,97 CONTROL "&Zachowaj znak wstawienia.",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,96,10 - CONTROL "&Zapisz ostatnią listę pliku przy wyjściu.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,96,10 + CONTROL "&Zapisz ostatnią listę pliku przy wyjściu.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,140,10 CONTROL "&Zapamiętaj wzór wyszukiwania.",IDC_REMEMBERSEARCHPATTERN, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,96,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,120,10 PUSHBUTTON "Odrzuć",IDC_REMOVE,212,107,50,14,WS_DISABLED DEFPUSHBUTTON "OK",IDOK,154,139,50,14,WS_DISABLED PUSHBUTTON "Anuluj",IDCANCEL,212,139,50,14 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index f6e64b445..b29d5d1da 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/Version.h b/src/Version.h index 1ac06be9c..92842eea5 100644 --- a/src/Version.h +++ b/src/Version.h @@ -74,7 +74,9 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1925) - #if(_MSC_FULL_VER >= 192528612) + #if(_MSC_FULL_VER >= 192528614) + #define VER_CPL MS Visual C++ 2019 v16.5.4 + #elif(_MSC_FULL_VER >= 192528612) #define VER_CPL MS Visual C++ 2019 v16.5.(2-3) #elif(_MSC_FULL_VER >= 192528611) #define VER_CPL MS Visual C++ 2019 v16.5.1 diff --git a/src/VersionEx.h b/src/VersionEx.h index 4085b1487..3e70345d5 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,8 +8,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 413 -#define VERSION_BUILD 3 +#define VERSION_REV 414 +#define VERSION_BUILD 2 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27