diff --git a/Build/Changes.txt b/Build/Changes.txt
index 7700eea19..e53b96c54 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -16,7 +16,7 @@ LEGEND:
2) CHANGES:
3) ENHANCEMENT: (Optimize)
4) FIXES: (Debug)
-5) REMOVED:
+5) REMOVED:
6) TRANSLATIONS (MUI): (New Language)
-----------------------------------------------------
@@ -32,7 +32,7 @@ GRE - (GRE)pWinNP3 Search in Files Tool
=====================================================
-Current RC1 Version 5.20.621.(build_#) (2020-06-21)
+Current RC1 Version 5.20.622.(build_#) (2020-06-22)
=====================================================
-----------------------------------------------------
diff --git a/Versions/day.txt b/Versions/day.txt
index 7e1aa3219..ff39c77bd 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-621
+622
diff --git a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
index 0dbc27315..a6dd86223 100644
--- a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
+++ b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
@@ -212,7 +212,7 @@ msgstr ""
#. Resource IDs: (109)
msgid "GREPWINNP3"
-msgstr ""
+msgstr "GREPWINNP3"
#. Resource IDs: (156)
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -486,7 +486,7 @@ msgstr ""
#. Resource IDs: (103, 129)
msgid "grepWinNP3"
-msgstr ""
+msgstr "grepWinNP3"
#. Resource IDs: (138)
msgid "grepWinNP3 Settings"
diff --git a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
index 845137a64..23ed1a077 100644
--- a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
+++ b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
@@ -541,8 +541,8 @@ msgid "regex ok"
msgstr "Regex OK"
#. Resource IDs: (117)
-msgid "reuse grepWin instances."
-msgstr "grepWin-Instanzen wiederverwenden."
+msgid "reuse grepWinNP3 instances."
+msgstr "grepWinNP3-Instanzen wiederverwenden."
#. Resource IDs: (151)
#, c-format
diff --git a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
index 45db2343b..25d569f7f 100644
--- a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
+++ b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
@@ -293,7 +293,7 @@ msgstr "Ne pas avertir lors du remplacement sans créer de sauvegardes"
#. Resource IDs: (1063)
msgid "Only one instance"
-msgstr "Seulement une instance de grepWinNP3"
+msgstr "Seulement une instance"
#. Resource IDs: (142)
msgid "Open containing folder"
diff --git a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
index 8ccb6fb67..61dabe4ca 100644
--- a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
+++ b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
@@ -39,7 +39,7 @@ msgstr "... %ld więcej dopasowań"
#. Resource IDs: (160)
msgid "Path does not exist or is not accessible!"
-msgstr ""
+msgstr "Ścieżka nie istnieje lub jest niedostępna!"
#. 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."
@@ -148,7 +148,7 @@ msgstr "Tryb ciemny"
#. Resource IDs: (159)
msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
-msgstr "Proszę najpierw włączyć tryb ciemny w ustawieniach systemu Windows (>= Win10 v1803)"
+msgstr "Tryb ciemny wymaga co najmniej Win10 v1803, i musi być włączony w ustawieniach systemu Windows."
#. Resource IDs: (139)
msgid "Date modified"
@@ -196,15 +196,15 @@ msgstr "Rozszerz."
#. Resource IDs: (164)
msgid "Export resultlist"
-msgstr ""
+msgstr "Eksportuj listę wyników"
#. Resource IDs: (163)
msgid "Export results..."
-msgstr ""
+msgstr "Eksportuj wyniki"
#. Resource IDs: (1039)
msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "Dopasuj nazwy plików, użyj:\n'|' rozdziela wzorce dopasowania tekstu\n'-' wyklucza"
+msgstr "Dopasuj nazwy plików, użyj:\n'|' aby rozdzielić wzorce dopasowania tekstu\n'-' aby wykluczyć"
#. Resource IDs: (1059)
msgid "Files"
@@ -240,7 +240,7 @@ msgstr "Niewłaściwa ścieżka!"
#. Resource IDs: (161)
msgid "Inverse search (NOT search string)"
-msgstr ""
+msgstr "Wyszukiwanie odwrotne (nie szukaj ciągu)"
#. Resource IDs: (1019)
msgid "KB"
@@ -289,7 +289,7 @@ msgstr "Starsze niż"
#. Resource IDs: (1090)
msgid "Don't warn when replacing without creating backups"
-msgstr ""
+msgstr "Nie ostrzegaj kiedy zamieniasz bez tworzenia kopii zapasowej"
#. Resource IDs: (1063)
msgid "Only one instance"
@@ -389,7 +389,7 @@ msgstr "Szukaj w"
#. Resource IDs: (162)
msgid "Search in found files"
-msgstr ""
+msgstr "Szukaj w znalezionych plikach"
#. Resource IDs: (1018)
msgid "Search results"
@@ -498,15 +498,15 @@ msgstr "Przytrzymaj klawisz Shift, aby znaleźć pliki, które NIE zawierają ci
#. Resource IDs: (165)
msgid "include file paths"
-msgstr ""
+msgstr "dotyczy ścieżek plików"
#. Resource IDs: (166)
msgid "include match line numbers"
-msgstr ""
+msgstr "dotyczy pasujących numerów wierszy"
#. Resource IDs: (167)
msgid "include match line text"
-msgstr ""
+msgstr "dotyczy pasujących wierszy tekstu"
#. Resource IDs: (132)
msgid "invalid regex!"
diff --git a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
index 8a3ba7b49..87ec25fcc 100644
--- a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
+++ b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
@@ -39,7 +39,7 @@ msgstr "%ld viac výskytov"
#. Resource IDs: (160)
msgid "Path does not exist or is not accessible!"
-msgstr ""
+msgstr "Cesta neexistuje alebo nie je prístupná!"
#. 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."
@@ -148,7 +148,7 @@ msgstr "Tmavý režim"
#. Resource IDs: (159)
msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings."
-msgstr "Prosím, najskôr v nastaveniach systému Windows povoľte tmavý režim (>= Win10 v1803)."
+msgstr "Tmavý režim vyžaduje aspoň Win10 v1803 a musí byť povolený v nastaveniach systému Windows."
#. Resource IDs: (139)
msgid "Date modified"
@@ -196,11 +196,11 @@ msgstr "Ext"
#. Resource IDs: (164)
msgid "Export resultlist"
-msgstr ""
+msgstr "Export výsledkov"
#. Resource IDs: (163)
msgid "Export results..."
-msgstr ""
+msgstr "Export výsledkov..."
#. Resource IDs: (1039)
msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
@@ -240,7 +240,7 @@ msgstr "Neplatná cesta!"
#. Resource IDs: (161)
msgid "Inverse search (NOT search string)"
-msgstr ""
+msgstr "Inverzné hľadanie (nie pre reťazec)"
#. Resource IDs: (1019)
msgid "KB"
@@ -289,7 +289,7 @@ msgstr "Staršie ako"
#. Resource IDs: (1090)
msgid "Don't warn when replacing without creating backups"
-msgstr ""
+msgstr "Nezobrazovať upozornenie pri zámene bez vytvorenia záloh"
#. Resource IDs: (1063)
msgid "Only one instance"
@@ -389,7 +389,7 @@ msgstr "Hľadať v"
#. Resource IDs: (162)
msgid "Search in found files"
-msgstr ""
+msgstr "Hľadať v nájdených súboroch"
#. Resource IDs: (1018)
msgid "Search results"
@@ -498,15 +498,15 @@ msgstr "podržte stlačenú klávesu Shift a vyhľadajte súbory, ktoré neobsah
#. Resource IDs: (165)
msgid "include file paths"
-msgstr ""
+msgstr "zahrnúť cesty k súborom"
#. Resource IDs: (166)
msgid "include match line numbers"
-msgstr ""
+msgstr "zahrnúť čísla riadkov zhody"
#. Resource IDs: (167)
msgid "include match line text"
-msgstr ""
+msgstr "zahrnúť text riadku zhody"
#. Resource IDs: (132)
msgid "invalid regex!"
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 8f5490f30..1bd6e6a8f 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
@@ -212,7 +212,7 @@ msgstr ""
#. Resource IDs: (109)
msgid "GREPWINNP3"
-msgstr ""
+msgstr "GREPWINNP3"
#. Resource IDs: (156)
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -486,7 +486,7 @@ msgstr ""
#. Resource IDs: (103, 129)
msgid "grepWinNP3"
-msgstr ""
+msgstr "grepWinNP3"
#. Resource IDs: (138)
msgid "grepWinNP3 Settings"
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 79c034272..734094a60 100644
--- a/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang
+++ b/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang
@@ -47,7 +47,7 @@ msgstr "%path% dosyanın yolu, %line% ile atlanacak satırla değiştirilir, %pa
#. Resource IDs: (119)
msgid "&About grepWinNP3..."
-msgstr "%GrepWin hakkında ..."
+msgstr "&GrepWinNP3 hakkında ..."
#. Resource IDs: (1049)
msgid "&Replace"
@@ -71,7 +71,7 @@ msgstr ">>>"
#. Resource IDs: (1052, 135)
msgid "About grepWinNP3"
-msgstr "GrepWin Hakkında"
+msgstr "GrepWinNP3 Hakkında"
#. Resource IDs: (1021)
msgid "Add to Presets"
diff --git a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
index ca97d5674..af62dc06b 100644
--- a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
+++ b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
@@ -59,11 +59,11 @@ msgstr "&Αναζήτηση"
#. Resource IDs: (1013)
msgid "..."
-msgstr ""
+msgstr "..."
#. Resource IDs: (1061, 1063, 1064, 1066, 1067)
msgid "/"
-msgstr ""
+msgstr "/"
#. Resource IDs: (1093)
msgid ">>>"
@@ -212,7 +212,7 @@ msgstr "Αρχεία"
#. Resource IDs: (109)
msgid "GREPWINNP3"
-msgstr ""
+msgstr "GREPWINNP3"
#. Resource IDs: (156)
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -486,7 +486,7 @@ msgstr "μεγαλλίτερο από"
#. Resource IDs: (103, 129)
msgid "grepWinNP3"
-msgstr ""
+msgstr "grepWinNP3"
#. Resource IDs: (138)
msgid "grepWinNP3 Settings"
diff --git a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
index 1f9d85641..e7d6b4387 100644
--- a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
+++ b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
@@ -212,7 +212,7 @@ msgstr ""
#. Resource IDs: (109)
msgid "GREPWINNP3"
-msgstr ""
+msgstr "GREPWINNP3"
#. Resource IDs: (156)
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -486,7 +486,7 @@ msgstr ""
#. Resource IDs: (103, 129)
msgid "grepWinNP3"
-msgstr ""
+msgstr "grepWinNP3"
#. Resource IDs: (138)
msgid "grepWinNP3 Settings"
diff --git a/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang b/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang
index 15643fe06..f96520432 100644
--- a/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang
+++ b/grepWinNP3/translationsNP3/简体中文 (中国) [zh-CN].lang
@@ -168,7 +168,7 @@ msgstr "双击选择一个预置方案"
#. Resource IDs: (65535 - PopupMenu)
msgid "Dummy"
-msgstr ""
+msgstr "假"
#. Resource IDs: (1067)
msgid "Editor"
diff --git a/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang b/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang
index 355a02704..4e4373d3d 100644
--- a/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang
+++ b/grepWinNP3/translationsNP3/繁體中文 (台灣) [zh-TW].lang
@@ -212,7 +212,7 @@ msgstr ""
#. Resource IDs: (109)
msgid "GREPWINNP3"
-msgstr ""
+msgstr "GREPWINNP3"
#. Resource IDs: (156)
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -486,7 +486,7 @@ msgstr ""
#. Resource IDs: (103, 129)
msgid "grepWinNP3"
-msgstr ""
+msgstr "grepWinNP3"
#. Resource IDs: (138)
msgid "grepWinNP3 Settings"
diff --git a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
index b1dc763b3..48c73471b 100644
--- a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
+++ b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
@@ -212,7 +212,7 @@ msgstr ""
#. Resource IDs: (109)
msgid "GREPWINNP3"
-msgstr ""
+msgstr "GREPWINNP3"
#. Resource IDs: (156)
msgid "If enabled, a backup folder is created inside the folder that's searched/replaced in, and the files are backed up into that folder"
@@ -486,7 +486,7 @@ msgstr ""
#. Resource IDs: (103, 129)
msgid "grepWinNP3"
-msgstr ""
+msgstr "grepWinNP3"
#. Resource IDs: (138)
msgid "grepWinNP3 Settings"
diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc
index 509a4e6b9..a1535c7fc 100644
--- a/language/np3_af_za/lexer_af_za.rc
+++ b/language/np3_af_za/lexer_af_za.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc
index e26a3998b..521d6ada2 100644
--- a/language/np3_be_by/dialogs_be_by.rc
+++ b/language/np3_be_by/dialogs_be_by.rc
@@ -833,7 +833,7 @@ BEGIN
IDD_MUI_LONGLINES, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 177
+ RIGHTMARGIN, 272
TOPMARGIN, 7
BOTTOMMARGIN, 48
END
diff --git a/language/np3_be_by/lexer_be_by.rc b/language/np3_be_by/lexer_be_by.rc
index bbbfec92b..9a8d34187 100644
--- a/language/np3_be_by/lexer_be_by.rc
+++ b/language/np3_be_by/lexer_be_by.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index 76899095a..564ee61bf 100644
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
@@ -683,7 +683,7 @@ BEGIN
END
IDD_MUI_CHOOSEFONT DIALOGEX 0, 0, 300, 200
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Font Chooser"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
diff --git a/language/np3_en_gb/lexer_en_gb.rc b/language/np3_en_gb/lexer_en_gb.rc
index 4f8be305c..65787e406 100644
--- a/language/np3_en_gb/lexer_en_gb.rc
+++ b/language/np3_en_gb/lexer_en_gb.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc
index 2ee4c31c6..bfcfade65 100644
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@@ -186,7 +186,7 @@ END
STRINGTABLE
BEGIN
- IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s"
+ IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s"
IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!"
IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""."
IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!"
diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index 23b2200ba..f6c0acc43 100644
--- a/language/np3_en_us/dialogs_en_us.rc
+++ b/language/np3_en_us/dialogs_en_us.rc
@@ -1,5 +1,6 @@
// Microsoft Visual C++ generated resource script.
-//
+// encoding: UTF-8
+#pragma code_page(65001) // UTF-8
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
@@ -18,7 +19,7 @@
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
+#pragma code_page(65001) // UTF-8
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -26,19 +27,19 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""winresrc.h""\r\n"
"#include ""../common_res.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -304,8 +305,6 @@ BEGIN
CONTROL "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,240
LTEXT "",IDC_STYLELABEL_ROOT,181,141,279,8
EDITTEXT IDC_STYLEEDIT_ROOT,181,152,279,12,ES_AUTOHSCROLL
- GROUPBOX "Info",IDC_INFO_GROUPBOX,181,7,280,127
- LTEXT "Customize Schemes",IDC_TITLE,264,25,180,12
LTEXT "",IDC_STYLELABEL,181,171,279,8
EDITTEXT IDC_STYLEEDIT,181,183,279,12,ES_AUTOHSCROLL
PUSHBUTTON "For&e...",IDC_STYLEFORE,181,201,46,14
@@ -319,6 +318,8 @@ BEGIN
PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14
DEFPUSHBUTTON "OK",IDOK,355,233,50,14
PUSHBUTTON "Cancel",IDCANCEL,410,233,50,14
+ GROUPBOX "Info",IDC_INFO_GROUPBOX,181,7,280,127
+ LTEXT "Customize Schemes",IDC_TITLE,264,25,180,12
EDITTEXT IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
END
@@ -562,7 +563,7 @@ CAPTION "Notepad3"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,21,20
- LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_NOPREFIX | 0x2000
+ LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX
DEFPUSHBUTTON "&OK",IDOK,187,50,50,14
CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10
@@ -574,7 +575,7 @@ CAPTION "Notepad3"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,21,20
- LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_NOPREFIX | 0x2000
+ LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX
PUSHBUTTON "&Yes",IDYES,131,50,50,14
PUSHBUTTON "&No",IDNO,187,50,50,14
CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK,
@@ -587,7 +588,7 @@ CAPTION "Notepad3"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,21,20
- LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_NOPREFIX | 0x2000
+ LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX
DEFPUSHBUTTON "&OK",IDOK,131,50,50,14
PUSHBUTTON "&Cancel",IDCANCEL,187,50,50,14
CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK,
@@ -600,7 +601,7 @@ CAPTION "Notepad3"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,21,20
- LTEXT "",IDC_INFOBOXTEXT,35,7,126,41,SS_NOPREFIX | 0x2000
+ LTEXT "",IDC_INFOBOXTEXT,35,7,126,41,SS_EDITCONTROL | SS_NOPREFIX
DEFPUSHBUTTON "&Yes",IDOK,7,70,50,14
PUSHBUTTON "&No",IDNO,61,70,50,14
PUSHBUTTON "&Cancel",IDCANCEL,115,70,50,14
@@ -614,7 +615,7 @@ CAPTION "Notepad3"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
ICON IDR_MAINWND,IDC_INFOBOXICON,7,7,21,20
- LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_NOPREFIX | 0x2000
+ LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX
DEFPUSHBUTTON "Retry",IDRETRY,131,50,50,14
PUSHBUTTON "&Cancel",IDCANCEL,187,50,50,14
CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK,
@@ -687,7 +688,7 @@ CAPTION "Font Chooser"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
LTEXT "&Font:",IDC_STATIC,7,7,127,8
- COMBOBOX IDC_FONT_FAMILY_NAMES,7,16,138,84,CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_FONT_FAMILY_NAMES,7,16,138,84,CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "F&ont Style:",IDC_STATIC,154,7,72,8
COMBOBOX IDC_FONT_FACE_NAMES,154,16,84,84,CBS_SIMPLE | WS_VSCROLL | WS_TABSTOP
LTEXT "&Size:",IDC_STATIC,247,7,40,8
diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index cefb521b3..68ebe42b8 100644
--- a/language/np3_es_es/dialogs_es_es.rc
+++ b/language/np3_es_es/dialogs_es_es.rc
@@ -683,7 +683,7 @@ BEGIN
END
IDD_MUI_CHOOSEFONT DIALOGEX 0, 0, 300, 200
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selector de fuente"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc
index 487228bae..1cffadf1b 100644
--- a/language/np3_es_es/lexer_es_es.rc
+++ b/language/np3_es_es/lexer_es_es.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 03f2739c8..5d5481835 100644
--- a/language/np3_fr_fr/dialogs_fr_fr.rc
+++ b/language/np3_fr_fr/dialogs_fr_fr.rc
@@ -683,7 +683,7 @@ BEGIN
END
IDD_MUI_CHOOSEFONT DIALOGEX 0, 0, 300, 200
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Font Chooser"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
@@ -833,7 +833,7 @@ BEGIN
IDD_MUI_LONGLINES, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 177
+ RIGHTMARGIN, 272
TOPMARGIN, 7
BOTTOMMARGIN, 48
END
diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc
index 475ed0824..094499e15 100644
--- a/language/np3_fr_fr/lexer_fr_fr.rc
+++ b/language/np3_fr_fr/lexer_fr_fr.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_hi_in/lexer_hi_in.rc b/language/np3_hi_in/lexer_hi_in.rc
index c3b0deced..6c2520eba 100644
--- a/language/np3_hi_in/lexer_hi_in.rc
+++ b/language/np3_hi_in/lexer_hi_in.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc
index 09a2251a2..36edbabc4 100644
--- a/language/np3_hi_in/strings_hi_in.rc
+++ b/language/np3_hi_in/strings_hi_in.rc
@@ -186,7 +186,7 @@ END
STRINGTABLE
BEGIN
- IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s"
+ IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s"
IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!"
IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""."
IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!"
diff --git a/language/np3_hu_hu/lexer_hu_hu.rc b/language/np3_hu_hu/lexer_hu_hu.rc
index 8084820f5..c12f43b6f 100644
--- a/language/np3_hu_hu/lexer_hu_hu.rc
+++ b/language/np3_hu_hu/lexer_hu_hu.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Helyettesítés"
IDS_LEX_STR_63362 "Módosító"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_id_id/lexer_id_id.rc b/language/np3_id_id/lexer_id_id.rc
index 5d9d88bc4..19a6ab164 100644
--- a/language/np3_id_id/lexer_id_id.rc
+++ b/language/np3_id_id/lexer_id_id.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_id_id/strings_id_id.rc b/language/np3_id_id/strings_id_id.rc
index 00a3f543e..941da2b02 100644
--- a/language/np3_id_id/strings_id_id.rc
+++ b/language/np3_id_id/strings_id_id.rc
@@ -186,7 +186,7 @@ END
STRINGTABLE
BEGIN
- IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s"
+ IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s"
IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!"
IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""."
IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!"
diff --git a/language/np3_it_it/lexer_it_it.rc b/language/np3_it_it/lexer_it_it.rc
index b757cbe4d..c0ba1c9d9 100644
--- a/language/np3_it_it/lexer_it_it.rc
+++ b/language/np3_it_it/lexer_it_it.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc
index 82fb5a9db..8e1e8cbdc 100644
--- a/language/np3_ja_jp/lexer_ja_jp.rc
+++ b/language/np3_ja_jp/lexer_ja_jp.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "置換"
IDS_LEX_STR_63362 "修飾子"
IDS_LEX_STR_63363 "タグ"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_ko_kr/lexer_ko_kr.rc b/language/np3_ko_kr/lexer_ko_kr.rc
index fd100fd7d..239317bf7 100644
--- a/language/np3_ko_kr/lexer_ko_kr.rc
+++ b/language/np3_ko_kr/lexer_ko_kr.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index c24607e8f..99ac3e3ab 100644
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
@@ -683,7 +683,7 @@ BEGIN
END
IDD_MUI_CHOOSEFONT DIALOGEX 0, 0, 300, 200
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Font Chooser"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc
index 1f1de847a..b6209d40c 100644
--- a/language/np3_nl_nl/lexer_nl_nl.rc
+++ b/language/np3_nl_nl/lexer_nl_nl.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_pl_pl/lexer_pl_pl.rc b/language/np3_pl_pl/lexer_pl_pl.rc
index 1d3449bc6..61e3f9e2b 100644
--- a/language/np3_pl_pl/lexer_pl_pl.rc
+++ b/language/np3_pl_pl/lexer_pl_pl.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Zastąpienie"
IDS_LEX_STR_63362 "Modyfikator"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_pt_br/lexer_pt_br.rc b/language/np3_pt_br/lexer_pt_br.rc
index fb61d8f9f..6d3e6012a 100644
--- a/language/np3_pt_br/lexer_pt_br.rc
+++ b/language/np3_pt_br/lexer_pt_br.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc
index 3f80ab7a2..7a309d529 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -186,7 +186,7 @@ END
STRINGTABLE
BEGIN
- IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s"
+ IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s"
IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!"
IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""."
IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!"
diff --git a/language/np3_pt_pt/lexer_pt_pt.rc b/language/np3_pt_pt/lexer_pt_pt.rc
index bbc52b539..ca5b4df14 100644
--- a/language/np3_pt_pt/lexer_pt_pt.rc
+++ b/language/np3_pt_pt/lexer_pt_pt.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substituição"
IDS_LEX_STR_63362 "Modificador"
IDS_LEX_STR_63363 "Etiqueta"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_ru_ru/lexer_ru_ru.rc b/language/np3_ru_ru/lexer_ru_ru.rc
index 88627293b..09837d2b6 100644
--- a/language/np3_ru_ru/lexer_ru_ru.rc
+++ b/language/np3_ru_ru/lexer_ru_ru.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_sk_sk/lexer_sk_sk.rc b/language/np3_sk_sk/lexer_sk_sk.rc
index 24290b837..ca111f955 100644
--- a/language/np3_sk_sk/lexer_sk_sk.rc
+++ b/language/np3_sk_sk/lexer_sk_sk.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_sv_se/lexer_sv_se.rc b/language/np3_sv_se/lexer_sv_se.rc
index cc9766d13..6a613a596 100644
--- a/language/np3_sv_se/lexer_sv_se.rc
+++ b/language/np3_sv_se/lexer_sv_se.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_tr_tr/lexer_tr_tr.rc b/language/np3_tr_tr/lexer_tr_tr.rc
index aae2643e1..e0dd11280 100644
--- a/language/np3_tr_tr/lexer_tr_tr.rc
+++ b/language/np3_tr_tr/lexer_tr_tr.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc
index 3ae747869..ae5647c98 100644
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@@ -186,7 +186,7 @@ END
STRINGTABLE
BEGIN
- IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s"
+ IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s"
IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!"
IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""."
IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!"
diff --git a/language/np3_vi_vn/lexer_vi_vn.rc b/language/np3_vi_vn/lexer_vi_vn.rc
index 662026b85..9e2cc92c8 100644
--- a/language/np3_vi_vn/lexer_vi_vn.rc
+++ b/language/np3_vi_vn/lexer_vi_vn.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_vi_vn/strings_vi_vn.rc b/language/np3_vi_vn/strings_vi_vn.rc
index 7478c36f5..7a80cd3ba 100644
--- a/language/np3_vi_vn/strings_vi_vn.rc
+++ b/language/np3_vi_vn/strings_vi_vn.rc
@@ -186,7 +186,7 @@ END
STRINGTABLE
BEGIN
- IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s"
+ IDS_MUI_RELOADSETTINGS "Activate saved settings by program relaunch?\n\n%s"
IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!"
IDS_MUI_EXPORT_FAIL "Error exporting style settings to ""%s""."
IDS_MUI_REGEX_INVALID "Error evaluating regular expression. Expression is invalid!"
diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc
index 5e97d63d0..1851e996d 100644
--- a/language/np3_zh_cn/dialogs_zh_cn.rc
+++ b/language/np3_zh_cn/dialogs_zh_cn.rc
@@ -683,7 +683,7 @@ BEGIN
END
IDD_MUI_CHOOSEFONT DIALOGEX 0, 0, 300, 200
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "选择字体"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
diff --git a/language/np3_zh_cn/lexer_zh_cn.rc b/language/np3_zh_cn/lexer_zh_cn.rc
index 6acfbe563..3c6e0a681 100644
--- a/language/np3_zh_cn/lexer_zh_cn.rc
+++ b/language/np3_zh_cn/lexer_zh_cn.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/language/np3_zh_tw/lexer_zh_tw.rc b/language/np3_zh_tw/lexer_zh_tw.rc
index 4b00d3a9c..2080de465 100644
--- a/language/np3_zh_tw/lexer_zh_tw.rc
+++ b/language/np3_zh_tw/lexer_zh_tw.rc
@@ -461,6 +461,9 @@ BEGIN
IDS_LEX_STR_63361 "Substitution"
IDS_LEX_STR_63362 "Modifier"
IDS_LEX_STR_63363 "Tag"
+ IDS_LEX_STR_63364 "Property Name"
+ IDS_LEX_STR_63365 "LD Keyword"
+ IDS_LEX_STR_63366 "ESC Sequence"
END
STRINGTABLE
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 37b3786a1..dda9a4023 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 6b6ed143a..8514a465f 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 621
+#define VERSION_REV 622
#define VERSION_BUILD 1
#define SCINTILLA_VER 443
#define ONIGURUMA_REGEX_VER 6.9.5