From 3faa2a14c75e580c09bc82f0187c65c8aad4c6a5 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 19 May 2020 21:16:46 +0200 Subject: [PATCH 1/2] MUI - Add minor Swedish translation of grepWinNP3 --- grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang index 7e165e533..87535459c 100644 --- a/grepWinNP3/translations/Svenska (Sverige) [sv-SE].lang +++ b/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" From f747abc1d4fa9d019458d104e75199fd649b4838 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 19 May 2020 21:17:35 +0200 Subject: [PATCH 2/2] + upd: Version files and Changes.txt --- Build/grepWinNP3.ini | 3 --- Versions/build.txt | 2 +- np3portableapp/build_np3portableapp.cmd | 1 - res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 Build/grepWinNP3.ini diff --git a/Build/grepWinNP3.ini b/Build/grepWinNP3.ini deleted file mode 100644 index 48947036b..000000000 --- a/Build/grepWinNP3.ini +++ /dev/null @@ -1,3 +0,0 @@ -[global] - -[settings] diff --git a/Versions/build.txt b/Versions/build.txt index d00491fd7..0cfbf0888 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1 +2 diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index bb22e569e..671f15f7c 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/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 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index aaa9cba57..f229b55c0 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index 0d34279cb..cbb04a370 100644 --- a/src/VersionEx.h +++ b/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