diff --git a/Build/Changes.txt b/Build/Changes.txt
index b96d60c78..eebc332d6 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -41,7 +41,7 @@ NEW:
-
- Current grepWin dev: add feature: export search results (GRE).
- Update the grepWinNP3 icon (GRE).
-- Add a grepWinNP3 toolbar icon (GRE).
+- Add a grepWinNP3 Toolbar icon (GRE).
- Configurable Zoom-Tooltip clear delay ([Settings2] ZoomTooltipimeout=3200.
- Add Install/Remove "Open with Notepad3" to Notepad3 Install version.
- Add another Dark Theme "Sombra".
@@ -49,7 +49,7 @@ NEW:
- Open default browser while clicking hyperlink tooltip.
- Regex multi-select feature.
- Toolbar hint for zoomed view.
-- "waifu2x" scaled std toolbar bitmaps.
+- "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).
@@ -58,6 +58,8 @@ NEW:
CHANGES:
-----------------------------------------------------
-
+- Two stage Toolbar reset (customizing): 1st -> settings 2nd -> factory default.
+- Replace non DPI Aware MessageBox for "Save on Close" by internal InfoBox.
- DPI_CHANGED msg handler.
- Workaround for DPI_AWARENESS Font Size problem on DPI_CHANGE.
- Non scaled transparent image on help dialog control for Rizonesoft (standard DPI resolution).
@@ -101,7 +103,7 @@ FIXES:
-
- Printing scaling problem related to DPI awareness changes.
- System MessageBox "save before close" positioning.
-- Reset of toolbar configuration dialog.
+- Reset of Toolbar configuration dialog.
- Crash if "close after find" is enabled.
- Keep current line on reverting file.
- Hardening commit_id.txt file input for version string assembling.
@@ -125,7 +127,7 @@ FIXES:
- Broken x86 (32-bit) build.
- Theme scheme file handling (file extension inheritance).
- Remember find pattern (Ctrl+F3).
-- Custiomize toolbar dialog closes immediately.
+- Customize Toolbar dialog closes immediately.
- ".ini-file" acquire lock for invalid file path.
- Cancel multi-selection on line up/down key.
- Initial behavior on open Find/Replace dialog.
diff --git a/Versions/day.txt b/Versions/day.txt
index 212abf5f3..60ac764e9 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-618
+620
diff --git a/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang b/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang
index fe2291669..85257e451 100644
--- a/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang
+++ b/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Ongeldig pad!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
index 2357ccfd3..0dbc27315 100644
--- a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
+++ b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
index b648ab8af..845137a64 100644
--- a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
+++ b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Pfad ungültig!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Umgekehrt suchen (NOT suchtext)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang b/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang
index 6db4c3080..fc7adb9f2 100644
--- a/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang
+++ b/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/English (United States) [en-US].lang b/grepWinNP3/translationsNP3/English (United States) [en-US].lang
index aec9d28a0..53d9530c4 100644
--- a/grepWinNP3/translationsNP3/English (United States) [en-US].lang
+++ b/grepWinNP3/translationsNP3/English (United States) [en-US].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Español (España) [es-ES].lang b/grepWinNP3/translationsNP3/Español (España) [es-ES].lang
index 791e34f32..51cd569bb 100644
--- a/grepWinNP3/translationsNP3/Español (España) [es-ES].lang
+++ b/grepWinNP3/translationsNP3/Español (España) [es-ES].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "¡Ruta invalida!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Búsqueda inversa (NO cadena de búsqueda)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
index d5de1be4b..45db2343b 100644
--- a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
+++ b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Chemin invalide!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Recherche inverse (PAS chaîne de recherche)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang b/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang
index 206574a14..9d9024d23 100644
--- a/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang
+++ b/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Percorso non valido!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang
index 294e7164c..a631a830b 100644
--- a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang
+++ b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Érvénytelen útvonal!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Inverz keresés (NOT kereső szüveg)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
index 54346ccac..88b9fc243 100644
--- a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
+++ b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Ongeldig pad!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Omgekeerd zoeken (GEEN zoekstring)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
index 84f4e8fae..8ccb6fb67 100644
--- a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
+++ b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Niewłaściwa ścieżka!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang b/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang
index 49e8ef2a3..0711b8f09 100644
--- a/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang
+++ b/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Caminho inválido!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Procura inversa (NÃO cadeia de procura)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
index b6934bd15..a69a33ec2 100644
--- a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
+++ b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Caminho inválido!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "Inverter pesquisa (NOT sequênciaprocurada)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
index ca8eb9066..8a3ba7b49 100644
--- a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
+++ b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Neplatná cesta!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang
index f9443d154..853547c83 100644
--- a/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang
+++ b/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Ogiltig mapp!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
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 a6d9ef828..8f5490f30 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
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
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 2d310a703..79c034272 100644
--- a/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang
+++ b/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Geçersiz yol!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
index fca62fc7e..ca97d5674 100644
--- a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
+++ b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Μη έγκυρη διαδρομή!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang
index a6719a1d8..47df539de 100644
--- a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang
+++ b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Памылковы шлях!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang
index db62ada93..9d3fd6b3f 100644
--- a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang
+++ b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "Неверный путь!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
index a13e88b9b..1f9d85641 100644
--- a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
+++ b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang b/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang
index 8d944418e..546cd2cb7 100644
--- a/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang
+++ b/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "無効なパスです!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang b/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang
index 7885da3ac..15643fe06 100644
--- a/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang
+++ b/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr "无效路径!"
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr "否定搜索(选定不符合条件的行)"
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang b/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang
index 9ddc126ba..355a02704 100644
--- a/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang
+++ b/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
index 3fc909d58..b1dc763b3 100644
--- a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
+++ b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
@@ -239,7 +239,7 @@ msgid "Invalid path!"
msgstr ""
#. Resource IDs: (161)
-msgid "Inverse search (NOT searchstring)"
+msgid "Inverse search (NOT search string)"
msgstr ""
#. Resource IDs: (1019)
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 37dc48958..4279191cd 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 RC1
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b51b71f20..9508ce0c4 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 618
+#define VERSION_REV 620
#define VERSION_BUILD 1
#define SCINTILLA_VER 443
#define ONIGURUMA_REGEX_VER 6.9.5