diff --git a/Build/Changes.txt b/Build/Changes.txt index 570b2e8bd..6d1ca5b13 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -32,7 +32,7 @@ GRE - (GRE)pWinNP3 Search in Files Tool ===================================================== -Current RC1 Version 5.20.626.(build_#) (2020-06-26) +Current RC1 Version 5.20.702.(build_#) (2020-07-02) ===================================================== ----------------------------------------------------- @@ -52,12 +52,14 @@ NEW: - "waifu2x" scaled std Toolbar bitmaps. - Call Notepad3 with case-sensitive and dot-match-all flag (if applicable). - Add "Overlapping Search" in Find/Replace dialog window. -- Integration of "grepWinNP3", a Search Tool in files (v2.1.0.10) (GRE). +- Integration of "grepWinNP3", a Search Tool in files (v2.1.2.16) (GRE). ----------------------------------------------------- CHANGES: ----------------------------------------------------- - +- Re-enable messages if File-Locking failded. +- Silent ignore write permissions missing on Inifile. - Replace non DPI Aware MessageBox for "Save on Close" by internal InfoBox - Set DirectWite (D2D) rendering technology as new default. - Two stage Toolbar reset (customizing): 1st -> settings 2nd -> factory default. diff --git a/Versions/day.txt b/Versions/day.txt index 104eee38f..88eafce37 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -626 +702 diff --git a/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang b/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang index bf0acf9f3..75facd2d2 100644 --- a/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang +++ b/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang index 60f291d4c..e480cdc1d 100644 --- a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang +++ b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang index 5d230faaf..e8f39f807 100644 --- a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang +++ b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s ist erhältlich" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang b/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang index 4ff840a12..b992cd8b3 100644 --- a/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang +++ b/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/English (United States) [en-US].lang b/grepWinNP3/translationsNP3/English (United States) [en-US].lang index 50543ac02..c869cb1ea 100644 --- a/grepWinNP3/translationsNP3/English (United States) [en-US].lang +++ b/grepWinNP3/translationsNP3/English (United States) [en-US].lang @@ -494,7 +494,7 @@ msgstr "" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Español (España) [es-ES].lang b/grepWinNP3/translationsNP3/Español (España) [es-ES].lang index 1ebde0c2b..bb71ba14b 100644 --- a/grepWinNP3/translationsNP3/Español (España) [es-ES].lang +++ b/grepWinNP3/translationsNP3/Español (España) [es-ES].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s está disponible" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang b/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang index d8edab345..19afaeee7 100644 --- a/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang +++ b/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s está disponible" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang index e535a39df..e5c5b10a1 100644 --- a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang +++ b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s est disponible" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang b/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang index 101126589..70a1b64b1 100644 --- a/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang +++ b/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s è disponibile" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang index bae436369..573bbbe92 100644 --- a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang +++ b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s elérhető" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang index b58fbaa77..104255f4a 100644 --- a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang +++ b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s is beschikbaar" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang index bd5cf1243..c7bd0b530 100644 --- a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang +++ b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang b/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang index 457114ed0..19a2511fc 100644 --- a/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang +++ b/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "Está disponível o grepWin %s" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang index 007fca3f0..18c18be66 100644 --- a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang +++ b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang index ea9d9169d..9021e3105 100644 --- a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang +++ b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s je k dispozícii" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang index d7e26392a..d4c8f9d7b 100644 --- a/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang +++ b/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang b/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang index 53c51d132..9b03ee12d 100644 --- a/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang +++ b/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang b/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang index b73237285..0d4d76ffe 100644 --- a/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang +++ b/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang index be6c80550..3e6f56933 100644 --- a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang +++ b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang index 72f3525cc..53cddc8f8 100644 --- a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang +++ b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang index 75ba33c68..fc54a37ed 100644 --- a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang +++ b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang index d24440264..2bb1cf935 100644 --- a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang +++ b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang b/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang index cac0bf182..dc7434587 100644 --- a/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang +++ b/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "最新の grepWin %s があります。" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang b/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang index d197e4edc..6e37dd635 100644 --- a/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang +++ b/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "grepWin %s 可用" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang b/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang index 776ccd52d..9963c3c31 100644 --- a/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang +++ b/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang index eec9700f4..ed0ae83cb 100644 --- a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang +++ b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang @@ -494,7 +494,7 @@ msgstr "grepWinNP3" #. Resource IDs: (168) #, c-format -msgid "grepWin %s is available" +msgid "grepWinNP3 %s is available" msgstr "" #. Resource IDs: (138) diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 8362271d3..6bbf739fb 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC1 diff --git a/src/Version.h b/src/Version.h index e65765ebf..1f6d45837 100644 --- a/src/Version.h +++ b/src/Version.h @@ -75,7 +75,7 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1926) #if(_MSC_FULL_VER >= 192628806) - #define VER_CPL MS Visual C++ 2019 v16.6.(1-2) + #define VER_CPL MS Visual C++ 2019 v16.6.(1-3) #elif(_MSC_FULL_VER >= 192628805) #define VER_CPL MS Visual C++ 2019 v16.6.0 #endif diff --git a/src/VersionEx.h b/src/VersionEx.h index b7ffac1b4..009a10b75 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 626 +#define VERSION_REV 702 #define VERSION_BUILD 1 #define SCINTILLA_VER 443 #define ONIGURUMA_REGEX_VER 6.9.5