diff --git a/Build/Changes.txt b/Build/Changes.txt
index e8cefd776..584f29957 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -70,6 +70,7 @@ ENHANCEMENT:
FIXES:
-----------------------------------------------------
-
+- Initial behavior on open Find/Replace dialog.
- Lost Find/Replace dialog settings.
- Lazy syntax styling (copy into multi-line string, etc.).
- ToolsMenu flickering.
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..00750edc0 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+3
diff --git a/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang b/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang
index 2e69b1bac..7d984b801 100644
--- a/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang
+++ b/grepWinNP3/translations/Polski (Polska)Polski [pl-PL].lang
@@ -184,7 +184,7 @@ msgstr "Wyklucz katalogi (Regex):"
#. Resource IDs: (158)
msgid "Ext"
-msgstr "Ext"
+msgstr "Rozszerz."
#. Resource IDs: (1039)
msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
diff --git a/grepWinNP3/translations/日本語 （日本） [ja-JP].lang b/grepWinNP3/translations/日本語 （日本） [ja-JP].lang
index 2d0150f0f..527fc46db 100644
--- a/grepWinNP3/translations/日本語 （日本） [ja-JP].lang
+++ b/grepWinNP3/translations/日本語 （日本） [ja-JP].lang
@@ -39,7 +39,7 @@ msgstr "%ld 以上の一致"
#. 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."
-msgstr "%path% でファイルのパスと置き換え - %line% で指定した行に移動, %pattern% with the search string."
+msgstr "%path% でファイルのパスと置き換え - %line% で指定した行に移動 - %pattern% で検索語句"
#. Resource IDs: (119)
msgid "&About grepWinNP3..."
@@ -136,11 +136,11 @@ msgstr "別のフォルダ内にバックアップを作成"
#. Resource IDs: (1064)
msgid "Dark mode"
-msgstr ""
+msgstr "ダークモード"
#. Resource IDs: (159)
msgid "Please enable dark mode first in the Windows system settings (>= Win10 v1803)."
-msgstr ""
+msgstr "先に Windows の色の設定から「黒」を選択してください (Win 10 v1803 以上)"
#. Resource IDs: (139)
msgid "Date modified"
@@ -523,8 +523,8 @@ msgstr "特定のディレクトリを除外できます。指定例: CVS およ
#. Resource IDs: (1061)
msgid "Reset"
-msgstr ""
+msgstr "初期化"
#. Resource IDs: (1088)
msgid "Max # of concurrent worker"
-msgstr ""
+msgstr "最大スレッド数"
diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc
index e6a468096..3036d9dea 100644
--- a/language/np3_it_it/dialogs_it_it.rc
+++ b/language/np3_it_it/dialogs_it_it.rc
@@ -377,8 +377,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Righe lunghe"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "&Multi edge-line pos:",IDC_STATIC,7,10,80,8
- EDITTEXT IDC_MULTIEDGELINE,92,7,180,14,ES_AUTOHSCROLL
+ LTEXT "&Pos. indicatore righe lunghe:",IDC_STATIC,7,10,90,8
+ EDITTEXT IDC_MULTIEDGELINE,102,7,170,14,ES_AUTOHSCROLL
CONTROL "Mostra &indicatore",IDC_SHOWEDGELINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,27,140,10
CONTROL "Cambia &colore di sfondo",IDC_BACKGRDCOLOR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,140,10
DEFPUSHBUTTON "OK",IDOK,166,34,50,14
diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc
index 4d3d9df95..06f1a2438 100644
--- a/language/np3_ja_jp/dialogs_ja_jp.rc
+++ b/language/np3_ja_jp/dialogs_ja_jp.rc
@@ -374,10 +374,10 @@ END
IDD_MUI_LONGLINES DIALOGEX 0, 0, 279, 55
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "行の長さのガイド設定"
+CAPTION "行の長さガイドの設定"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "&Multi edge-line pos:",IDC_STATIC,7,10,80,8
+ LTEXT "長い行の上限値(&M):",IDC_STATIC,7,10,80,8
EDITTEXT IDC_MULTIEDGELINE,92,7,180,14,ES_AUTOHSCROLL
CONTROL "境界を線で表示(&E)",IDC_SHOWEDGELINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,27,140,10
CONTROL "背景色を変更(&B)",IDC_BACKGRDCOLOR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,140,10
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 7de41b7a0..dac2aa0fa 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -315,7 +315,7 @@ BEGIN
POPUP "表示(&V)"
BEGIN
MENUITEM "右端で折り返す(&R)\tCtrl+W", IDM_VIEW_WORDWRAP
- MENUITEM "行の長さのガイド(&L)\tCtrl+Alt+L", IDM_VIEW_LONGLINEMARKER
+ MENUITEM "行の長さガイド(&L)\tCtrl+Alt+L", IDM_VIEW_LONGLINEMARKER
MENUITEM "インデントのガイド(&A)\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES
MENUITEM SEPARATOR
MENUITEM "折り返し記号(&P)\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS
@@ -410,7 +410,7 @@ BEGIN
MENUITEM "タブキーで空白を入力(&S)", IDM_VIEW_TABSASSPACES
MENUITEM "タブキーの設定(&T)...\tCtrl+T", IDM_VIEW_TABSETTINGS
MENUITEM "折り返し方の設定(&W)...", IDM_VIEW_WORDWRAPSETTINGS
- MENUITEM "行の長さのガイド設定(&L)...", IDM_VIEW_LONGLINESETTINGS
+ MENUITEM "行の長さガイドの設定(&L)...", IDM_VIEW_LONGLINESETTINGS
MENUITEM "自動インデント(&D)", IDM_VIEW_AUTOINDENTTEXT
MENUITEM "自動閉じHTML/XMLタグ(&H)\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS
MENUITEM "単語補完(&U)", IDM_VIEW_AUTOCOMPLETEWORDS
diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc
index b363f7a23..5549ae306 100644
--- a/language/np3_pl_pl/dialogs_pl_pl.rc
+++ b/language/np3_pl_pl/dialogs_pl_pl.rc
@@ -377,8 +377,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Długie wiersze"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- LTEXT "&Multi edge-line pos:",IDC_STATIC,7,10,80,8
- EDITTEXT IDC_MULTIEDGELINE,92,7,180,14,ES_AUTOHSCROLL
+ LTEXT "&Poz. linii wielokrawędziowej:",IDC_STATIC,7,10,90,8
+ EDITTEXT IDC_MULTIEDGELINE,102,7,170,14,ES_AUTOHSCROLL
CONTROL "Pokaż krawędź linii.",IDC_SHOWEDGELINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,27,140,10
CONTROL "Zmień kolor tła.",IDC_BACKGRDCOLOR,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,38,140,10
DEFPUSHBUTTON "OK",IDOK,166,34,50,14
diff --git a/minipath/language/mp_ja_jp/strings_ja_jp.rc b/minipath/language/mp_ja_jp/strings_ja_jp.rc
index 386a48899..7e8664480 100644
--- a/minipath/language/mp_ja_jp/strings_ja_jp.rc
+++ b/minipath/language/mp_ja_jp/strings_ja_jp.rc
@@ -132,7 +132,7 @@ BEGIN
IDS_COPYMOVE "対象のフォルダを選択してください。"
IDS_CREATELINK "選択項目のショートカットを作成するフォルダを選択します。"
IDS_SAVESETTINGS "設定の保存\n現在の設定を保存しました。"
- IDS_MUI_TRANSL_AUTHOR "(ja-JP) 日本語翻訳 by maboroshin"
+ IDS_MUI_TRANSL_AUTHOR "(ja-JP) 日本語翻訳 maboroshin"
END
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 3e582972f..d1fd05f0a 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 04e788332..035efd505 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,11 +9,11 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 429
-#define VERSION_BUILD 2
+#define VERSION_BUILD 3
#define SCINTILLA_VER 433
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27
#define TINYEXPR_VER 2018.05.11
#define UTHASH_VER 2.1.0
#define VERSION_PATCH BETA
-#define VERSION_COMMIT_ID t7820-rk
+#define VERSION_COMMIT_ID dkt1-amr