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

Build/grepWinNP3.ini

@@ -1,3 +0,0 @@
-[global]
-
-[settings]

Versions/build.txt

@@ -1 +1 @@
-1
+2

grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang

@@ -39,7 +39,7 @@ msgstr "%ld fler träffar"
 
 #. Resource IDs: (160)
 msgid "Path does not exist or is not accessible!"
-msgstr ""
+msgstr "Sökvägen existerar inte, eller kan inte nås!"
 
 #. Resource IDs: (1069)
 msgid "%path% is replaced with the path of the file, %line% with the line to jump to, %pattern% with the search string."
@@ -144,7 +144,7 @@ msgstr "Mörkt läge"
 
 #. Resource IDs: (159)
 msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
-msgstr "Aktivera mörkt läge i Windows syteminställningar (>= Win10 v1803)."
+msgstr "Mörkt läge kräver åtminstone Win10 v1803, och måste ha aktiverats i Windows systeminställningar."
 
 #. Resource IDs: (139)
 msgid "Date modified"
@@ -289,7 +289,7 @@ msgstr "Öppna med editor"
 
 #. Resource IDs: (1056)
 msgid "Paste text to test the regex with:"
-msgstr ""
+msgstr "Klistra in text att testa regex med:"
 
 #. Resource IDs: (137)
 msgid "Path"

np3portableapp/build_np3portableapp.cmd

@@ -101,7 +101,6 @@ if not exist "%NP3_PORTAPP_DIR%\App\DefaultData\settings\" mkdir "%NP3_PORTAPP_D
 
 copy "%NP3_DISTRIB_DIR%\Notepad3.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\Notepad3.ini" /Y /V
 copy "%NP3_DISTRIB_DIR%\minipath.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\minipath.ini" /Y /V
-copy "%NP3_DISTRIB_DIR%\grepWinNP3.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\grepWinNP3.ini" /Y /V
 copy "%NP3_DISTRIB_DIR%\Changes.txt" "%NP3_PORTAPP_DIR%\Other\Help\Changes.txt" /Y /V
 copy "%NP3_DISTRIB_DIR%\License.txt" "%NP3_PORTAPP_DIR%\Other\Help\License.txt" /Y /V
 copy "%NP3_DISTRIB_DIR%\Readme.txt" "%NP3_PORTAPP_DIR%\Other\Help\Readme.txt" /Y /V

res/Notepad3.exe.manifest.conf

@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.519.1"
+    version="5.20.519.2"
     type="win32"
   />
   <description>Notepad3 BETA</description>

src/VersionEx.h

@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 519
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 433
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27