Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV

Versions/day.txt

@@ -1 +1 @@
-310
+311

res/Notepad3.exe.manifest.conf

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

src/Version.h

@@ -74,7 +74,9 @@
 
 #if defined(_MSC_VER)
     #if (_MSC_VER == 1924)
-        #if(_MSC_FULL_VER >= 192428316)
+        #if(_MSC_FULL_VER >= 192428319)
+            #define VER_CPL     MS Visual C++ 2019 v16.4.6
+        #elif(_MSC_FULL_VER >= 192428316)
             #define VER_CPL     MS Visual C++ 2019 v16.4.(4-5)
         #elif(_MSC_FULL_VER >= 192428315)
             #define VER_CPL     MS Visual C++ 2019 v16.4.3

src/VersionEx.h

@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 310
+#define VERSION_REV 311
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.4
@@ -16,4 +16,4 @@
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
 #define VERSION_PATCH RC3
-#define VERSION_COMMIT_ID nebukadn
+#define VERSION_COMMIT_ID dkt1-amr

test/test_files/encoding/UTF-8/Summary special chars (utf-8) (Conf=43) (issue #2076).txt

@@ -0,0 +1,12 @@
+Open 7-bit ASCII files in UTF-8 mode is checked !
+------------------------------------------------------
+Your update is merged. 👍
+Your comments and suggestions are welcome... 😃
+Thanks for your interest and your contributions to Notepad3. 👍 😃
+sk-SK: [Slovak (Slovakia)] - [Slovenčina (Slovensko)]
+Latitude Longitude: 50° 35' North, 3° 53' East
+Description:"Subtítulos"  and  Description:"Súbtitulos"
+Précis: and echo: 输入u盘目录
+le développement continue!
+Dös üst ön ßaurer (ẞAURER) Äpfel!
+