Merge pull request #4135 from hpwamr/mui

+ Upd: Version files and Changes.txt
2026-06-20 21:13:25 +08:00 · 2022-08-29 15:40:05 +02:00 · 2022-08-29 15:40:05 +02:00 · 5e6429d7a1
commit 5e6429d7a1
parent 858de5e5aa 601663b189
31 changed files with 49 additions and 44 deletions
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library


 ========================================================
-Current BETA/RC Version 5.22.828.(build_#) (2022-08-28)
+Current BETA/RC Version 5.22.829.(build_#) (2022-08-29)
 ========================================================

 --------------------------------------------------------
@ -55,6 +55,7 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.829.1]- Renaming feature from obscure "Accelerated Word Navigation" to better name "Alternate Word Separators".
 [.418.1]- Sync the "Sombra" Scheme Collection with the "Window Dark Mode".
 [.414.1]- Using 'Cascadia Mono' as default for pure 'Text File' scheme (if available).
 [.302.1]- Default settings for Auto-Save beta version.
@ -82,16 +83,20 @@ CHANGES:
 --------------------------------------------------------
 CHANGES Versions in Tools or Libraries:
 --------------------------------------------------------
+[.829.1]- Update Oniguruma Regex (ONI) engine version 6.9.8 (2022-08-28).
 [.209.1]- Update Scintilla Library (SCI) version 5.2.0 (2022-02-09).
 [.209.1]- Update Lexilla Library (LEX) version 5.1.5 (2022-02-09).
 [1201.1]- Update grepWinNP3 (GRE) version 2.1.9.41 (2021-11-30).
-[1130.1]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-10-19).
 [.713.1]- Update MiniPath (MIN) version 1.0.2.181 (2020-07-13).

 --------------------------------------------------------
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[.829.1]-  Directory locking of current file.
+[.829.1]- Remember user data entered for dialogs: EncloseSel, ModifyLines, InsertTag, StreamComment.
+[.829.1]- Uninitialized variable, causing problems on copy multi-selection.
+[.829.1]- Special not found position value in case of regex search.
 [.828.1]- Unicode Detection in case of pure ASCCI containing null bytes.
 [.828.1]- ASCII only issue of not reliable IsTextUnicode().
 [.502.1]- Using "Cascadia Mono" over "Cascadia Code" if applicable (regarding to "Text File" Scheme change).
--- a/grepWinNP3/grepWinNP3.vcxproj
+++ b/grepWinNP3/grepWinNP3.vcxproj
@ -175,7 +175,7 @@
      <Command>xcopy "$(ProjectDir)translationsNP3\*.lang" "..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lng\gwLng\*" /V /Q /Y</Command>
    </PostBuildEvent>
    <PostBuildEvent>
-      <Message>Copy language resorces to build directory</Message>
+      <Message>Copy language resources to build directory</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -209,7 +209,7 @@
      <Command>xcopy "$(ProjectDir)translationsNP3\*.lang" "..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lng\gwLng\*" /V /Q /Y</Command>
    </PostBuildEvent>
    <PostBuildEvent>
-      <Message>Copy language resorces to build directory</Message>
+      <Message>Copy language resources to build directory</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -253,7 +253,7 @@
      <Command>xcopy "$(ProjectDir)translationsNP3\*.lang" "..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lng\gwLng\*" /V /Q /Y</Command>
    </PostBuildEvent>
    <PostBuildEvent>
-      <Message>Copy language resorces to build directory</Message>
+      <Message>Copy language resources to build directory</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Dbg|Win32'">
@ -292,7 +292,7 @@
      <Command>xcopy "$(ProjectDir)translationsNP3\*.lang" "..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lng\gwLng\*" /V /Q /Y</Command>
    </PostBuildEvent>
    <PostBuildEvent>
-      <Message>Copy language resorces to build directory</Message>
+      <Message>Copy language resources to build directory</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -334,7 +334,7 @@
      <Command>xcopy "$(ProjectDir)translationsNP3\*.lang" "..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lng\gwLng\*" /V /Q /Y</Command>
    </PostBuildEvent>
    <PostBuildEvent>
-      <Message>Copy language resorces to build directory</Message>
+      <Message>Copy language resources to build directory</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Dbg|x64'">
@ -371,7 +371,7 @@
      <Command>xcopy "$(ProjectDir)translationsNP3\*.lang" "..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lng\gwLng\*" /V /Q /Y</Command>
    </PostBuildEvent>
    <PostBuildEvent>
-      <Message>Copy language resorces to build directory</Message>
+      <Message>Copy language resources to build directory</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/translate.txt
+++ b/translate.txt
@ -3,7 +3,7 @@
 ==  This ".txt" file is intended for "Translators" to communicate to them the "Line numbers" of the   ==
 ==  "Added or Modified" items in the "Resource" files ("filename_xx_yy.rc" and "grepWinNP3.lang").    ==
 ==                                                                                                    ==
-==                                                                         Last update:  2022-04-16   ==
+==                                                                         Last update:  2022-08-29   ==
 ========================================================================================================

 January 2022:   Line numbers to translate_2022-01 - https://workupload.com/file/3kmZN49gB9w (2022-01-29)
@ -14,13 +14,13 @@ March 2022:     Line numbers to translate_2022-03 - No "Added or Modified" items

 April 2022:     Line numbers to translate_2022-04 - https://workupload.com/file/tgdbQPMbZyP (2022-04-16)

-May 2022:       Line numbers to translate_2022-05 -  No "Added or Modified" items in May 2022
+May 2022:       Line numbers to translate_2022-05 - No "Added or Modified" items in May 2022

-June 2022:      Line numbers to translate_2022-06 -  No "Added or Modified" items in June 2022
+June 2022:      Line numbers to translate_2022-06 - No "Added or Modified" items in June 2022

-July 2022:      Line numbers to translate_2022-07 -  No "Added or Modified" items in July 2022
+July 2022:      Line numbers to translate_2022-07 - No "Added or Modified" items in July 2022

-August 2022:    Line numbers to translate_2022-08 -  (2022-08-xx)
+August 2022:    Line numbers to translate_2022-08 - https://workupload.com/file/asUCvAHvZ8K (2022-08-29)

 September 2022: Line numbers to translate_2022-09 -  (2022-09-xx)

--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Outo-Sluit &HTML/XML\tCtrl+Shift+H",              IDM_SET_AUTOCLOSETAGS
        MENUITEM "O&uto-Voltooi Woorde",                            IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Outo-Voltooi Le&xer-Sleutel-Woorde",              IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Versnelde Woord Navi&gasie\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Slegs Een Keer per &Lêer",                        IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Lêerverandering-&Kennisgewing...\tAlt+F5",        IDM_SET_CHANGENOTIFY
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Аўтазакрыццё тэгаў &HTML/XML\tCtrl+Shift+H",  IDM_SET_AUTOCLOSETAGS
        MENUITEM "Cамадавяр&шэнне слоў",                        IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Cамадавяршэнне на аснове &лексемаў",          IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Паскораная навігацыя па слова&х\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",      IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Толькі адзін &экземпляр на файл",             IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Паведамленне а&б змяненні файла...\tAlt+F5",  IDM_SET_CHANGENOTIFY
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Tagabschluss &HTML/XML\tCtrl+Shift+H",   IDM_SET_AUTOCLOSETAGS
        MENUITEM "Auto Wort &Vorschläge",                       IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto &Lexer KeyWord Vorschläge",              IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "&Alternative Wort Seperatoren\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternative Wort Se&peratoren\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Nur eine &Instanz pro Datei",                 IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Nachricht bei &Dateiänderung...\tAlt+F5",     IDM_SET_CHANGENOTIFY
--- a/language/np3_el_gr/menu_el_gr.rc
+++ b/language/np3_el_gr/menu_el_gr.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Αυτόματο κλείσιμο Η&ΤΜL/XML\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "Αυτόματη συμπλήρωση λέ&ξεων",                     IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Α&υτόμ. συμπλήρωση λέ&ξεων-κλειδιών του Lexer",   IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Ταχεία &περιήγηση λέξεων\tCtrl+Alt+A",            IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Μόνο μία παρουσία ανά &αρχείο",                   IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Ειδοποίηση μετα&βολής αρχείου...\tAlt+F5",        IDM_SET_CHANGENOTIFY
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto Complete Words",                     IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto Complete Lexer-&Key-Words",           IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Only One Instance per &File",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "File &Change Notification...\tAlt+F5",     IDM_SET_CHANGENOTIFY
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto Complete Words",                     IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto Complete Lexer-&Key-Words",           IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Alternate Word Separators\tCtrl+Alt+A",    IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Only One Instance per &File",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "File &Change Notification...\tAlt+F5",     IDM_SET_CHANGENOTIFY
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Cierre &HTML/XML\tCtrl+Shift+H",                 IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto completar palabras",                            IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto completar palabras clave 'Le&xer'",              IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A",       IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Se&paradores alternativos de palabra\tCtrl+Alt+A",    IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Solo una instancia por &archivo",                     IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "N&otificación de cambios en archivo...\tAlt+F5",      IDM_SET_CHANGENOTIFY
--- a/language/np3_es_mx/menu_es_mx.rc
+++ b/language/np3_es_mx/menu_es_mx.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Cierre &HTML/XML\tCtrl+Shift+H",                 IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto completar palabras",                            IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto completar palabras clave 'Le&xer'",              IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "&Navegación por palabra acelerada\tCtrl+Alt+A",       IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Se&paradores alternativos de palabra\tCtrl+Alt+A",    IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Solo una instancia por &archivo",                     IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "N&otificación de cambios en archivo...\tAlt+F5",      IDM_SET_CHANGENOTIFY
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Fermeture Auto des Balises &HTML/XML\tCtrl+Shift+H",  IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto-complétion des Mots",                           IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto-complétion des &Mots-clés Lexer",                IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Navi&gation Accélérée par Mot\tCtrl+Alt+A",           IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Sé&parateurs alternatifs de mot\tCtrl+Alt+A",        IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Seulement une instance par &fichier",                 IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Notif&ication de Modification de Fichier...\tAlt+F5", IDM_SET_CHANGENOTIFY
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@ -345,7 +345,7 @@ BEGIN
        MENUITEM "दीर्घ रेखा चिन्हक (&L)\tCtrl+Alt+L",        IDM_VIEW_LONGLINEMARKER
        MENUITEM "इंडेंटेशन निर्देशिका (&G)\tCtrl+Shift+G",    IDM_VIEW_SHOWINDENTGUIDES
        MENUITEM SEPARATOR
-        MENUITEM "लपेटे हुए चिन्ह दिखाएं (&R)\tCtrl+Shift+7",     IDM_VIEW_WORDWRAPSYMBOLS
+        MENUITEM "लपेटे हुए चिन्ह दिखाएं (&P)\tCtrl+Shift+7",     IDM_VIEW_WORDWRAPSYMBOLS
        MENUITEM "खाली स्थान दिखाएं (&B)\tCtrl+Shift+8",           IDM_VIEW_SHOWBLANKS
        MENUITEM "वाक्य अंत दिखाएं (&E)\tCtrl+Shift+9",     IDM_VIEW_SHOWEOLS
        MENUITEM SEPARATOR
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "HTML/XML स्वत: बंद करें (&H)\tCtrl+Shift+H",    IDM_SET_AUTOCLOSETAGS
        MENUITEM "शब्द स्वतः पूर्ण करें (&U)",                       IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Lexer-Key-Words स्वतः पूर्ण करें (&K)",           IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "शब्द यात्रा त्वरित गति (&G)\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators (&P)\tCtrl+Alt+A",    IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "प्रति फ़ाइल केवल एक अवस्था (&F)",                IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "फ़ाइल परिवर्तन अधिसूचना (&C)...\tAlt+F5",        IDM_SET_CHANGENOTIFY
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "HTML/&XML aut. lezárás\tCtrl+Shift+H",        IDM_SET_AUTOCLOSETAGS
        MENUITEM "Szó kie&gészítés",                            IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Lexer kul&csszavak kiegészítése",             IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "G&yorsított szó navigálás\tCtrl+Alt+A",       IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",      IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Egy &példány fájlonként",                     IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Figyel&meztetés fájl változásról...\tAlt+F5", IDM_SET_CHANGENOTIFY
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto Complete Words",                     IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto Complete Lexer-&Key-Words",           IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Only One Instance per &File",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "File &Change Notification...\tAlt+F5",     IDM_SET_CHANGENOTIFY
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Chiusura automatica &HTML/XML\tCtrl+Shift+H",      IDM_SET_AUTOCLOSETAGS
        MENUITEM "Completamento a&utomatico delle parole",           IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Completamento automatico &keywords lexer",         IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Navi&gazione accelerata delle parole\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",           IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Solo una istanza per &File",                       IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Notifica di modifi&che al file...\tAlt+F5",        IDM_SET_CHANGENOTIFY
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@ -318,7 +318,7 @@ BEGIN
            MENUITEM "指定の切替(&T)\tCtrl+F2",                BME_EDIT_BOOKMARKTOGGLE
            MENUITEM SEPARATOR
            MENUITEM "次へ(&N)\tF2",                              BME_EDIT_BOOKMARKNEXT
-            MENUITEM "前へ(&T)\tShift+F2",                        BME_EDIT_BOOKMARKPREV
+            MENUITEM "前へ(&P)\tShift+F2",                        BME_EDIT_BOOKMARKPREV
            MENUITEM SEPARATOR
            MENUITEM "すべて消去(&C)\tAlt+F2",                     BME_EDIT_BOOKMARKCLEAR
        END
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "自動閉じHTML/XMLタグ(&H)\tCtrl+Shift+H",        IDM_SET_AUTOCLOSETAGS
        MENUITEM "単語補完(&U)",                                 IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "予約語を自動補完(&K)",                          IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "単語選択を広く(&G)\tCtrl+Alt+A",                IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators(&P)\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "ファイルごとに単一インスタンス(&F)",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "ファイルの変更を通知(&C)...\tAlt+F5",          IDM_SET_CHANGENOTIFY
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "HTML/XML 자동 닫기(&H)\tCtrl+Shift+H",    IDM_SET_AUTOCLOSETAGS
        MENUITEM "단어 자동 완성(&U)",                      IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "어휘 자동 완성(&K)",                       IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "가속화된 단어 탐색(&G)\tCtrl+Alt+A",       IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators(&P)\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "파일당 하나의 인스턴스만(&F)",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "파일 변경 알림(&C)...\tAlt+F5",           IDM_SET_CHANGENOTIFY
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "&HTML/XML tags automatisch sluiten\tCtrl+Shift+H",    IDM_SET_AUTOCLOSETAGS
        MENUITEM "Sleutelwoorden &automatisch aanvullen",           IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "'Lexer' sleutelwoorden auto&matisch aanvullen",   IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Versnelde woordnavi&gatie\tCtrl+Alt+A",           IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Slechts één instantie per &bestand",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Melding bij bestandswijziging...\tAlt+F5",        IDM_SET_CHANGENOTIFY
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Automatyczne zamykanie &HTML/XML\tCtrl+Shift+H",  IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&utouzupełnianie wyrazów",                       IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Autouzupełnianie Lekserem",                       IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Przyspieszona nawigacja wyrazów\tCtrl+Alt+A",     IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Tylko jedna istancja pliku",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Powiadomienie o zmianie pliku...\tAlt+F5",        IDM_SET_CHANGENOTIFY
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Fechar Automaticamente &HTML/XML\tCtrl+Shift+H",      IDM_SET_AUTOCLOSETAGS
        MENUITEM "Completa Palavras A&utomaticamente",                  IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Completa Automaticamente Palavras-&Chaves-Léxicas",   IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Nave&gação de Palavra Acelerada\tCtrl+Alt+A",         IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",              IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Somente Uma &Instância por Arquivo",                  IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Notificação de &Mudança de Arquivo...\tAlt+F5",       IDM_SET_CHANGENOTIFY
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Fechar automaticamente &HTML/XML\tCtrl+Shift+H",     IDM_SET_AUTOCLOSETAGS
        MENUITEM "Conclusão a&utomática das palavras",                 IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Conclusão automática palavras chave Lexer",          IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Nave&gação acelerada de palavras\tCtrl+Alt+A",       IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",             IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Só uma instância por &Ficheiro",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Notificação de alteração de fi&cheiro...\tAlt+F5",    IDM_SET_CHANGENOTIFY
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Автозакрытие тегов &HTML/XML\tCtrl+Shift+H",  IDM_SET_AUTOCLOSETAGS
        MENUITEM "Авто&завершение слов",                        IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Автозавершение на основе &лексем",            IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Ускоренная нави&гация по словам\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",      IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Только один &экземпляр на файл",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "&Уведомление об изменении файла...\tAlt+F5",  IDM_SET_CHANGENOTIFY
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto-zakončovanie &HTML/XML\tCtrl+Shift+H",    IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&utomatické dokončovanie slov",               IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto-kompletizácia kľúčových slov &Lexer",     IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Zrýchlená navi&gácia slov\tCtrl+Alt+A",        IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",       IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "&Iba jedna inštancia na súbor",                IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "&Oznámenie o zmene súboru...\tAlt+F5",         IDM_SET_CHANGENOTIFY
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Stäng HTML/XML automatiskt\tCtrl+Shift+H",        IDM_SET_AUTOCLOSETAGS
        MENUITEM "Kompletera ord automatiskt",                      IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Komplettera Lexer-&Key-Words automatiskt",        IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Accelerad ordnavigering\tCtrl+Alt+A",             IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",          IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Bara en instans per fil",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Notifiering vid filändring...\tAlt+F5",            IDM_SET_CHANGENOTIFY
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "HTML/&XML kod imleri otomatik kapatılsın\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "Sözcükler &otomatik tamamlansın",                   IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "&Lexer-&anahtar sözcükleri otomatik tamamlansın",   IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "&Hızlandırılmış sözcük gezinmesi\tCtrl+Alt+A",      IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",            IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "&Her dosya tek pencerede açılsın",                  IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "Dosyadaki değişiklikler bildirilsin...\tAlt+F5",    IDM_SET_CHANGENOTIFY
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "A&uto Complete Words",                     IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "Auto Complete Lexer-&Key-Words",           IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "Only One Instance per &File",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "File &Change Notification...\tAlt+F5",     IDM_SET_CHANGENOTIFY
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "自动关闭 &HTML/XML 标记\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "自动补全单词(&U)",                            IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "自动补全语法关键字(&K)",                      IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "加速单词导航(&G)\tCtrl+Alt+A",                IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators(&P)\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "对每个文件仅允许单个实例(&F)",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "文件修改通知(&C)...\tAlt+F5",                 IDM_SET_CHANGENOTIFY
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@ -462,7 +462,7 @@ BEGIN
        MENUITEM "自動關閉 HTML/XML 標記(&H)\tCtrl+Shift+H",       IDM_SET_AUTOCLOSETAGS
        MENUITEM "自動完成單詞(&U)",                            IDM_SET_AUTOCOMPLETEWORDS
        MENUITEM "自動完成語法關鍵字(&K)",                      IDM_SET_AUTOCLEXKEYWORDS
-        MENUITEM "加速單詞導覽(&G)\tCtrl+Alt+A",                IDM_SET_ALTERNATE_WORD_SEPS
+        MENUITEM "Alternate Word Se&parators(&P)\tCtrl+Alt+A",   IDM_SET_ALTERNATE_WORD_SEPS
        MENUITEM SEPARATOR
        MENUITEM "每個檔案只有一個執行個體(&F)",              IDM_SET_SINGLEFILEINSTANCE
        MENUITEM "檔案修改通知(&C)...\tAlt+F5",                 IDM_SET_CHANGENOTIFY
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@ -6,5 +6,5 @@
    version="5.22.829.1"
    type="win32"
  />
-  <description>Notepad3 LongPath</description>
+  <description>Notepad3 beta</description>
 </assembly>
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@ -16,5 +16,5 @@
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.3.0
-#define VERSION_PATCH LongPath
-#define VERSION_COMMIT_ID metaneoc
+#define VERSION_PATCH beta
+#define VERSION_COMMIT_ID dkt1-amr