From 5b5f6c5ba57015eee7ac3f88497b94725167744d Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Mon, 4 Jun 2018 11:27:52 +0200
Subject: [PATCH 1/9] + fix: center command line help dialogbox + add:
 Accelerator-Key for "Accelerated Word Navigation" => Ctrl+Alt+A

---
 src/Dialogs.c   | 2 ++
 src/Notepad3.rc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Dialogs.c b/src/Dialogs.c
index 3c4f7bcaf..cc4434015 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -287,6 +287,8 @@ void DisplayCmdLineHelp(HWND hwnd)
   mbp.lpfnMsgBoxCallback = NULL;
   mbp.dwLanguageId = MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL);
 
+  hhkMsgBox = SetWindowsHookEx(WH_CBT, &_MsgBoxProc, 0, GetCurrentThreadId());
+
   MessageBoxIndirect(&mbp);
 }
 
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index de216bd27..6ad8b0c7a 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -358,7 +358,7 @@ BEGIN
         MENUITEM "Auto In&dent Text",           IDM_VIEW_AUTOINDENTTEXT
         MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS
         MENUITEM "A&uto Complete Words",        IDM_VIEW_AUTOCOMPLETEWORDS
-        MENUITEM "Accelerated Word Navi&gation", IDM_VIEW_ACCELWORDNAV
+        MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
         MENUITEM SEPARATOR
         MENUITEM "&Reuse Window",               IDM_VIEW_REUSEWINDOW
         MENUITEM "Sticky Window &Position",     IDM_VIEW_STICKYWINPOS
@@ -456,6 +456,7 @@ BEGIN
     "A",            IDM_EDIT_SELECTALL,     VIRTKEY, CONTROL, NOINVERT
     "A",            IDM_VIEW_MARKOCCUR_ONOFF, VIRTKEY, ALT, NOINVERT
     "A",            CMD_RECODEANSI,         VIRTKEY, SHIFT, CONTROL, NOINVERT
+    "A",            IDM_VIEW_ACCELWORDNAV, VIRTKEY, CONTROL, ALT, NOINVERT
     "B",            IDM_EDIT_FINDMATCHINGBRACE, VIRTKEY, CONTROL, NOINVERT
     "B",            IDM_EDIT_PADWITHSPACES, VIRTKEY, ALT, NOINVERT
     "B",            IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL, NOINVERT

From ed1f8eb9db477aff59183ade24cd4af042c3bdf8 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Mon, 4 Jun 2018 17:02:19 +0200
Subject: [PATCH 2/9] + add: Accelerator-Key for "Accelerated Word Navigation"
 => Ctrl+Alt+A for all languages (menu resources)

---
 language/np3_af_za/menu_af_za.rc        | Bin 41516 -> 41540 bytes
 language/np3_de_de/menu_de_de.rc        | Bin 43014 -> 43038 bytes
 language/np3_en_uk/menu_en_uk.rc        | Bin 41510 -> 41534 bytes
 language/np3_en_us/menu_en_us.rc        | Bin 41504 -> 41528 bytes
 language/np3_es_es/menu_es_es.rc        | Bin 41584 -> 41608 bytes
 language/np3_fr_fr/menu_fr_fr.rc        | Bin 41486 -> 41510 bytes
 language/np3_nl_nl/menu_nl_nl.rc        | Bin 41502 -> 41526 bytes
 np3portableapp/build_np3portableapp.cmd |   2 +-
 src/Notepad3.rc                         |   1 +
 9 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index a3ec4e3ea4c6f20018a503d1922300e71837b12f..ae5ebca8d24349ed52383d14ee05b12b04ea8d0d 100644
GIT binary patch
delta 28
kcmZ2;gz3l;rVSk}le2vICU3ChV04^ZST4DFK}(M;0Jp#k>Hq)$

delta 18
acmX?dglWwYrVSk}lZ(nFHt%TZkp%!)&<N!K

diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 56f2d6ed785196cbe6b27bab102415a28798acb4..a4405110d9e25b041a3b1c0cdcb38853120de940 100644
GIT binary patch
delta 28
kcmZp>z%=gy(}p*llb<#7O}?PQ!RR<yu}E?=OBa(I0KwP`X#fBK

delta 18
acmbPtfvN2R(}p*lla-1jHp_G|$pHXU$OonX

diff --git a/language/np3_en_uk/menu_en_uk.rc b/language/np3_en_uk/menu_en_uk.rc
index 2e1cec777a87e81318e7f2bb94263ec83079a80b..f02b7e2089906360d5751bcdcf78cf8e9a335439 100644
GIT binary patch
delta 24
gcmZ2>glXRqrVSk}lanmO7#$~H%$D4|pruU~0E&DHlmGw#

delta 18
acmdmYglX9krVSk}lP_gUY~In*CJO*sstG3m

diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index ba4d9cd299d54bc96aedec7809c7b66f53b36afb..ae66a160932fc6e975856a77d2c69e03b069cec0 100644
GIT binary patch
delta 24
gcmZ2*glWeSrVTAElY^qf7#$}s%#qwYr=>*}0El-AVE_OC

delta 18
acmdmSglWMMrVTAElNaSkY~Iq+A`1XmD+uBM

diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 0ea7d384f548167aba774b8ade5a00b5a8a2c9c6..7371575be64753aa6290280385a3237aedc19a8a 100644
GIT binary patch
delta 28
kcmexxgsI~w(}oQ#lO^i;CMTG2Fgi{S%$D4IqGg3F0JTsH!2kdN

delta 18
acmeA;%Jks~(}oQ#lY_D)Ha}=tAqxOm;R!AP

diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 30d6b04f33936031d4896f121f55c890ead806fa..ac330080dd1bb442b87f6bbdbda960a25e9a3e4b 100644
GIT binary patch
delta 28
kcmeA>!nEuN(}uE^$q_z$lMi@uFgi{?m?^orucbj20J1s@&Hw-a

delta 18
acmZ2>gsJZc(}uE^$%ir}HZN;wkOcr$>Il04

diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 0261e6e9b76b9d048a467c08494bc7a1001c7208..3d54c04ef664feff2d0afbe2dfa239852b5679f4 100644
GIT binary patch
delta 24
gcmbPtglXFmrVVW^la0*87#$}YW=n3K*U}&h0D&Y4r~m)}

delta 18
acmdmXglXOprVVW^lZ~<^Hg9WbkOcr#cnEC(

diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 84edc0da6..fb7efc1e0 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -35,7 +35,7 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab
 set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
 set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
 
-set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR
+set NP3_LANGUAGE_SET=af-ZA de-DE en-UK es-ES fr-FR nl-NL
 
 set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
 set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index 555d3f6c3..675b7c83e 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -75,6 +75,7 @@ BEGIN
     "A",            IDM_EDIT_SELECTALL,     VIRTKEY, CONTROL, NOINVERT
     "A",            IDM_VIEW_MARKOCCUR_ONOFF, VIRTKEY, ALT, NOINVERT
     "A",            CMD_RECODEANSI,         VIRTKEY, SHIFT, CONTROL, NOINVERT
+    "A",            IDM_VIEW_ACCELWORDNAV,  VIRTKEY, CONTROL, ALT, NOINVERT
     "B",            IDM_EDIT_FINDMATCHINGBRACE, VIRTKEY, CONTROL, NOINVERT
     "B",            IDM_EDIT_PADWITHSPACES, VIRTKEY, ALT, NOINVERT
     "B",            IDM_EDIT_SELTOMATCHINGBRACE, VIRTKEY, SHIFT, CONTROL, NOINVERT

From 54947bbe5b6bf33520c46febf1b7f5f097e86be5 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 5 Jun 2018 11:13:35 +0200
Subject: [PATCH 3/9] + add: support for "Rust" source code syntax highlighting

---
 language/common_res.h               |   5 +++
 language/np3_af_za/lexer_af_za.rc   | Bin 34306 -> 34826 bytes
 language/np3_de_de/lexer_de_de.rc   | Bin 34302 -> 34822 bytes
 language/np3_en_uk/lexer_en_uk.rc   | Bin 34344 -> 34864 bytes
 language/np3_en_us/lexer_en_us.rc   | Bin 31076 -> 31578 bytes
 language/np3_es_es/lexer_es_es.rc   | Bin 34396 -> 34916 bytes
 language/np3_fr_fr/lexer_fr_fr.rc   | Bin 34298 -> 34822 bytes
 language/np3_nl_nl/lexer_nl_nl.rc   | Bin 31046 -> 31548 bytes
 res/Notepad3.exe.manifest.conf      |   2 +-
 scintilla/Scintilla.vcxproj         |   1 +
 scintilla/Scintilla.vcxproj.filters |   3 ++
 scintilla/src/Catalogue.cxx         |   2 +-
 src/Styles.c                        |  46 ++++++++++++++++++++++++++++
 src/Styles.h                        |   2 +-
 src/Version.h                       | Bin 26608 -> 26814 bytes
 15 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/language/common_res.h b/language/common_res.h
index 7eb0bb8c3..da982c2b4 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -627,6 +627,7 @@
 #define IDS_LEX_MATLAB                  63043
 #define IDS_LEX_NIM_SRC                 63044
 #define IDS_LEX_R_STAT                  63045
+#define IDS_LEX_RUST_SRC                63046
 
 #define IDS_LEX_STD_STYLE               63100
 #define IDS_LEX_STD_MARGIN              63101
@@ -872,5 +873,9 @@
 #define IDS_LEX_STR_63340               63340
 #define IDS_LEX_STR_63341               63341
 #define IDS_LEX_STR_63342               63342
+#define IDS_LEX_STR_63343               63343
+#define IDS_LEX_STR_63344               63344
+#define IDS_LEX_STR_63345               63345
+#define IDS_LEX_STR_63346               63346
 
 #endif //_COMMON_RES_H_
diff --git a/language/np3_af_za/lexer_af_za.rc b/language/np3_af_za/lexer_af_za.rc
index 05308f8889e2b9a5efb650e76bba034ce5e43b72..84516d374227b3e5e13a9f5c9725a2cc052eec84 100644
GIT binary patch
delta 159
zcmZqbVd|Q|v>`xt@&y?w)=-9EhLFjO{F>}R45bXk3?-8ddE_?-$hM?T_N(w?G?~m;
zDLi>Yh0tW7d?RLK29wE&rNZn^43!Ke45^bRrd!Gb#TZN(6i}cNgFjF{gCUinXmVnn
rH7iJs+2oHr!lGa+fNFghG8xi<@+Ckzce101_~aSvGMhg%2{8iz&KD;%

delta 19
acmeC0z|_>kv>`xt^FG;@)XjHV^q2uqS_lOI

diff --git a/language/np3_de_de/lexer_de_de.rc b/language/np3_de_de/lexer_de_de.rc
index a445b72fdab82932ff9e3932a6d6eace82ecf726..8a5b45b99c6b22e4c776150f4f4f0b0ac185fc1d 100644
GIT binary patch
delta 161
zcmey@&D1u5X+xOo<O4iXtf36S3?Y*lMbsxR@MU2wWhiDSnQSPMJNbYf%VYsLmd$Hq
z^-?DrnE6az(8MzNNQ}T_flQXkJ1PViLnb>W8iGYlV!@)Ul?){esgnz>Ey1Ff3WX;3
zWb#aQakK#O8O<h7^c5BdTfm^e;KPu~kj9V-)RD=M3)H2^E;@N0yVT|{O<c?Xo%1r$

delta 31
ncmZph!1S-1X+xOo<Ny)B$rqG3HcQFrrB0s5F17hj3l}p0!>0?W

diff --git a/language/np3_en_uk/lexer_en_uk.rc b/language/np3_en_uk/lexer_en_uk.rc
index d169088e0c00d5c1dde0623f7526c9e21136dc0f..789aeb8870597525fd93afc9e80907b77d81cd4f 100644
GIT binary patch
delta 159
zcmZ3{!?a-n(}n`s$sc5-SVI|t8A2v2@@ujOF_bbCGn7mY<dNT8Als5UIj_Qx(PXk>
zrSRkn6+)AZ@{O2{8B8WOmI|{wF;p^?Fr-f2m~JT#6k{-DP(Xo74E{j*42D#OqREYU
r)~p~kW|IYZg+;+u0M+_1WHO`y<x7Bc?&L%f@yR>br8e_5OECiggv=*~

delta 19
bcmdlmfoVk#(}n`s&G%$mQaAr;F<}M(Shxtc

diff --git a/language/np3_en_us/lexer_en_us.rc b/language/np3_en_us/lexer_en_us.rc
index b3b10effbba141b87b40c46dd7ab3ec94838339d..f7bf4ee394c3e8f2dfcc0ae640f3b117b1a26321 100644
GIT binary patch
delta 134
zcmaFziSgDq#tjFgCh<$K2Qh>)1T%z84iu7{yug=*wUnWlp=9zyKKacDr1GLC3l#b>
znoMrA7oN<OBg7aonK8_e(RlKGT~T%?hDwGKhSbT9T9&NF3?>YwlMQ2KCpY9+O`fDD
lGWmljizv__1_cHmhD?SuhEyOslOY$Vej&U5W}h+%W&kV6Cr$tW

delta 19
bcmcchjq%AR#tjFgHY-TyMQ>KAFk=P)Whe-8

diff --git a/language/np3_es_es/lexer_es_es.rc b/language/np3_es_es/lexer_es_es.rc
index 788618e8d72ba1caea7a53af165e1109da037e02..0ca3953350322cfe8a627e7893382141566ce0bd 100644
GIT binary patch
delta 148
zcmcc9!}MeV(}q6TNdgk=K@6b`!3-gjH}WV?R^Vm>@=F<t8A>KU<d@&vC)<)bIl#+j
z@`NUq$wf6nliyVcO%BL60`r^lgxH-JDj7-`QYW8Jw*-p`)e3R?14S|zQW=USCsx`{
lRx%NiR$_n}%AmmD!;s0429zxU(z!sL2if&E>oglM0{{qGEhPW|

delta 19
bcmaDdf$2^U(}q6T&3|NDQa4MrdNBh4UhxQ!

diff --git a/language/np3_fr_fr/lexer_fr_fr.rc b/language/np3_fr_fr/lexer_fr_fr.rc
index 8578f169a8e793dedc55ec850d0ab9fcbc429db5..8e1d1b5b18c7965b1fb9f248885ae80c0da5a4ac 100644
GIT binary patch
delta 149
zcmey>&D1u5X+wzYWC3mo_8^8(hG2$}$p^XACw~xSVJ&4SW+<8bkxO~9f?3dH0eP0q
zt7P?3C+nH{uo^R%Fc?pE6cnDktwLb3N|V{-PxV6VP7IX{B@C&P8I3HNfhs0%tQ4Ny
wmB};N$<YF=!))?HQDI@Qu?z|fJ`9-*X$+}A9hs9a#z{_|!!EV?QxgX>0QQnAhyVZp

delta 35
rcmZph!1Sw|X+wzYWIqwV$p-o?lN;n%Hp|HArB0s1F17hz3kNd*<+%($

diff --git a/language/np3_nl_nl/lexer_nl_nl.rc b/language/np3_nl_nl/lexer_nl_nl.rc
index 5edfca5f7af5299ff9d8fd7c67f6d07ee67a9dbe..1b661b3e6b589177799895c6f2029625ac5b5f90 100644
GIT binary patch
delta 137
zcmX^1iE+<2#to~aCZFSyU=LylWe8>nncT}IIk`ZJg|(ESn4x6ydM^3RtEBRxCvT8(
znH-S8HMvMvWb&76p~)$wW|N(4gxH-JDj7-`QYRPMSuz?=me&)VtP{&Kd5O6Nt1*KK
ogW2RnDPdu-Q49(UJ`9-*X$+}A^_i0|21`y}z%I4ftW1Cz03^sMf&c&j

delta 23
fcmdn<jq%tg#to~aHgiemMNj@zCAV3pLVy_niQx(f

diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 4b7b33f6f..31b99ad39 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="4.18.519.997"
+    version="4.18.605.1001"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index 80db1b3ca..f566bc0ff 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -297,6 +297,7 @@
     <ClCompile Include="lexers\LexR.cxx" />
     <ClCompile Include="lexers\LexRegistry.cxx" />
     <ClCompile Include="lexers\LexRuby.cxx" />
+    <ClCompile Include="lexers\LexRust.cxx" />
     <ClCompile Include="lexers\LexSQL.cxx" />
     <ClCompile Include="lexers\LexTCL.cxx" />
     <ClCompile Include="lexers\LexVB.cxx" />
diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
index f51856662..234149116 100644
--- a/scintilla/Scintilla.vcxproj.filters
+++ b/scintilla/Scintilla.vcxproj.filters
@@ -450,6 +450,9 @@
     <ClCompile Include="win32\ScintillaDLL.cxx">
       <Filter>win32</Filter>
     </ClCompile>
+    <ClCompile Include="lexers\LexRust.cxx">
+      <Filter>lexers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\ILexer.h">
diff --git a/scintilla/src/Catalogue.cxx b/scintilla/src/Catalogue.cxx
index 8ee396777..76238994c 100644
--- a/scintilla/src/Catalogue.cxx
+++ b/scintilla/src/Catalogue.cxx
@@ -167,7 +167,7 @@ int Scintilla_LinkLexers() {
 	//LINK_LEXER(lmREBOL);
 	LINK_LEXER(lmRegistry);
 	LINK_LEXER(lmRuby);
-	//LINK_LEXER(lmRust);
+	LINK_LEXER(lmRust);
 	//LINK_LEXER(lmScriptol);
 	//LINK_LEXER(lmSmalltalk);
 	//LINK_LEXER(lmSML);
diff --git a/src/Styles.c b/src/Styles.c
index aec71bf3f..88602689d 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -2940,6 +2940,51 @@ EDITLEXER lexR = { SCLEX_R, IDS_LEX_R_STAT, L"R-S-SPlus Statistics Code", L"R",
 
 
 
+KEYWORDLIST KeyWords_Rust = {
+  // Primary keywords and identifiers
+  "as be break const continue crate else enum extern false fn for "
+  "if impl in let loop match mod mut once pub ref return self "
+  "static struct super trait true type unsafe use while",
+  // Built in types
+  "bool char f32 f64 i16 i32 i64 i8 int str u16 u32 u64 u8 uint",
+  // Other keywords
+  "abstract alignof become box do final macro offsetof override "
+  "priv proc pure sizeof typeof unsized virtual yield",
+  // Keywords 4
+  "",
+  // Keywords 5
+  "",
+  // Keywords 6
+  "", 
+  // Keywords 7
+  "",
+  // 0
+  "" };
+
+
+EDITLEXER lexRust = { SCLEX_RUST, IDS_LEX_RUST_SRC, L"Rust Source Code", L"rs; rust", L"", &KeyWords_Rust,{
+  { STYLE_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
+  //{ SCE_RUST_DEFAULT, IDS_LEX_STR_63126, L"Default", L"", L"" },
+  { SCE_RUST_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
+  { SCE_RUST_WORD, IDS_LEX_STR_63128, L"Keyword", L"bold; fore:#248112", L"" },
+  { SCE_RUST_WORD2, IDS_LEX_STR_63343, L"Build-In Type", L"fore:#A9003D", L"" },
+  { SCE_RUST_WORD3, IDS_LEX_STR_63345, L"Other Keyword", L"italic; fore:#248112", L"" },
+  //{ SCE_RUST_WORD4, IDS_LEX_STR_63128, L"Keyword 4", L"bold; fore:#0A246A", L"" },
+  //{ SCE_RUST_WORD5, IDS_LEX_STR_63128, L"Keyword 5", L"bold; fore:#0A246A", L"" },
+  //{ SCE_RUST_WORD6, IDS_LEX_STR_63128, L"Keyword 6", L"bold; fore:#0A246A", L"" },
+  //{ SCE_RUST_WORD7, IDS_LEX_STR_63128, L"Keyword 7", L"bold; fore:#0A246A", L"" },
+  { SCE_RUST_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#666666", L"" },
+  { MULTI_STYLE(SCE_RUST_COMMENTBLOCK,SCE_RUST_COMMENTLINE,SCE_RUST_COMMENTBLOCKDOC,SCE_RUST_COMMENTLINEDOC), IDS_LEX_STR_63127, L"Comment", L"italic; fore:#488080", L"" },
+  { MULTI_STYLE(SCE_RUST_STRING,SCE_RUST_STRINGR,SCE_RUST_CHARACTER,0), IDS_LEX_STR_63131, L"String", L"fore:#B31C1B", L"" },
+  { SCE_RUST_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#666666", L"" },
+  { SCE_RUST_MACRO, IDS_LEX_STR_63280, L"Macro Definition", L"fore:#0A246A", L"" },
+  { SCE_RUST_LIFETIME, IDS_LEX_STR_63346, L"Rust Lifetime", L"fore:#B000B0", L"" },
+  { SCE_RUST_LEXERROR, IDS_LEX_STR_63252, L"Parsing Error", L"fore:#F0F0F0; back:#F00000", L"" },
+  { MULTI_STYLE(SCE_RUST_BYTESTRING,SCE_RUST_BYTESTRINGR,SCE_RUST_BYTECHARACTER,0), IDS_LEX_STR_63344, L"Byte String", L"fore:#C0C0C0", L"" },
+  { -1, 00000, L"", L"", L"" } } };
+
+
+
 // This array holds all the lexers...
 // Don't forget to change the number of the lexer for HTML and XML
 // in Notepad2.c ParseCommandLine() if you change this array!
@@ -2983,6 +3028,7 @@ static PEDITLEXER g_pLexArray[NUMLEXERS] =
   &lexRC,            // Resource Script
   &lexR,             // R Statistics Code
   &lexRUBY,          // Ruby Script
+  &lexRust,          // Rust Script
   &lexBASH,          // Shell Script
   &lexSQL,           // SQL Query
   &lexTCL,           // Tcl Script
diff --git a/src/Styles.h b/src/Styles.h
index e87f65e01..00850b1fc 100644
--- a/src/Styles.h
+++ b/src/Styles.h
@@ -61,7 +61,7 @@ typedef struct _editlexer
 
 
 // Number of Lexers in pLexArray
-#define NUMLEXERS 47
+#define NUMLEXERS 48
 #define AVG_NUM_OF_STYLES_PER_LEXER 20
 
 
diff --git a/src/Version.h b/src/Version.h
index 0d3cba6f8b635015c00c6e3a31f00af775ef5ac5..0b056fd2609fc9244b0d2b384ad9b84c2d973711 100644
GIT binary patch
delta 34
qcmexxo^jtr#tm*kjK-5c#z{`T5EjR3&Y;I&Jo#XV=VrU0O`-q*mJN3R

delta 14
WcmdmYk@3TM#tm*kn?-_Gi2?vO5e9Mq


From 65d67c8bfd2d9ae21ce185a1ac6ced2a020c42a9 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 5 Jun 2018 11:32:44 +0200
Subject: [PATCH 4/9] + add: Rust syntax coloring scheme entry

---
 Build/Notepad3.ini | Bin 5468 -> 5508 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 5b9767a406899208e4ebf794bca582628999dc4d..82fb6ba1dbd9e8285077152b8fd0aed66e12e4fb 100644
GIT binary patch
delta 24
gcmcbk)uO%Om@s<~Ln%WsL&;=+A;rzdgr_kA0BiCHEC2ui

delta 16
XcmZqCzN59_nDFFBLJFJtM9LTeJlF;@


From 4c0429964a1713c5633bc8fc449604a521402828 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 5 Jun 2018 20:25:46 +0200
Subject: [PATCH 5/9] + fix: merge conflict

---
 src/Dialogs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Dialogs.c b/src/Dialogs.c
index ec4fc716c..7c6e4656b 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -292,8 +292,6 @@ void DisplayCmdLineHelp(HWND hwnd)
 
   hhkMsgBox = SetWindowsHookEx(WH_CBT, &_MsgBoxProc, 0, GetCurrentThreadId());
 
-  hhkMsgBox = SetWindowsHookEx(WH_CBT, &_MsgBoxProc, 0, GetCurrentThreadId());
-
   MessageBoxIndirect(&mbp);
   //MsgBoxLng(MBINFO, IDS_MUI_CMDLINEHELP);
 }

From b2e658f5cc0adedcf702527b7878e195d5db41d8 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 6 Jun 2018 00:57:56 +0200
Subject: [PATCH 6/9] + add: first German strings for dialogs

---
 language/np3_de_de/dialogs_de_de.rc | Bin 72762 -> 72660 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index 48b56eb57c529226950492753caa8f23a0cb8690..7b87b015d60388123c2b96e786029d65bdc5ca9d 100644
GIT binary patch
delta 1528
zcmbVMOH5Ny5FIR`MuI?~KM1tt^AaN1pR|-jq=a99AP9kkh*G4KT6~Z`P=gEO+6`p<
zY&1q<T%%opx^d^q#2DRZB5CZxxKK=tE2Ex!Yehi>+}xWxGk509%$a$(lKEmebE&aF
z-$%1_iYB<NV8Ni!&liQrMk)oRCQ(rtHy37QxD;xm7){YCIjEB+VHAOp4GvVA!7E0Z
z_#owDI92{+G;q6Ngcqyo?cK18!8#1LD$PM}BZUU(3#9V5w6+<gwKZ)$h<HL@1KR-p
zjZ+e5m|X@FH&z|zQB!|*M8+2Wn)rd~y3S8dwy*iiLx?pCoJn{P=tR5#BpQw3CDM+{
zn9s~NDi!L1M5QQV*`&3Ga|SrYI{+`pmoHl$89E_P<vj>5L7E1(01p=}bAvz2Gznb@
z75c4!_}|LGq5}SA+{^PdBl<(+r)u)?z2YM!>)2D+#t~1T6%|qW=)p^RFS(?3ui3}@
z9Y(!u7qGbOCEVc{)z?ui^j_{Y8+iV0S-wKu$XN72lU_9b?&w2n2V^BhcVfU8#;wWh
z>q~nC^6YiwD&HQq^8M20+!olT>mcytSUdSjZE1Yb`eu(wp;owz%7SV#Z2?^6lO7AN
zd2R9MWuG&)rWBhCll=H<h2_r}HuOgDL{Kv0X?eU|$@_oe4e7in%&n@!_B5TgBj1qD
zM|I-I4hgulfqV<uE^?9^4cR>jPw?pj``Byo?wE`hxVgG%3qszk-YFsPZcD<K8%TF2
zcefNP<ZI4`O>{~)qdBR8JcmJ=ph-?Ri}}3k*d|hl;Yf{O!WAi3s2}!XkW=eM3}||+
zzlyQOcm&<{T(=xFkL-sJOJTuX`xmMg^Luwkewrb_HXyfnQe=PSN&b`U@ip%|U3!nk
zSL>f-UhKnG2w`_bu&*NW7E>p7!We*SxCiix$t@U>NvN<B@-w)_#*zCIcNgAbD+%2k
pl3dq}!oyiP(?T9jZ4BrGG@Xa=Vw|H0HiLVLKl%;vuEr0qe*j&ua}EFi

delta 1428
zcmb_cOH5Ni6uq@gYDI%hZE7i>*Me12g#Js7Vvz(BQ3PuYAxbEvluG&7kA=8E*Dg%C
zD|WCkEJy@ug3-8e$I7tKxG*uAxO1axW8#@<p=n}`A?D@Hn>TasnRD+wciwGlUcS(5
zgbdnVO3)0A^UvnIB}`e0(j+O=jaiz;DJ56zG*wt_(W$u0Y%^Y?2xUrUc6=i+jB$s>
z#G}R$wU0cUulG4Bt#SaJr6k1wox>~zXa(OHtS#`flSX!)8P<9!NNv=~KgI&VO8+r<
z#wF1iImV^;L^ZUf*4sR6x~W!Zj9<0pwE^--;3xF~&kYHc#laEKP{@w|d78sKhCtGQ
z7qk=+l(axTKyZ^oeHu$f+E4E%KzJzlOHz^_J02|6h4}OC(V85<B7npe-)URmw{=|&
zJvb-{XaOr+CXmCJBrrh<c32iweg-|Oh&x47@}TR;ZWIMb;faA%6l0oe+aKxt<U&9Q
z3%Tyom5F|9UsQLJk7qkB=u3qKQa}9WDZ`r$VRL!aP6HD6z6?3bR;Pn6HJ;b??D1sP
zika6Mub3`_cLuLQB6)K%b>PCPram4YX=ksmzHqnc(;-7Ij09m3q$seRZt<5DLm_EX
z4nbV|Jh2r9VoKK1PH|psIi>P)_p*n-2M=@qi8bEM+sqZG!6yg%3_vG&aHqL&#C}}$
zS1}GDO@5^5;F26w{TDHAl!Ulkggc-F(>fQb?nOXBwhjjVL6EQipvLXf)s-kzR<3S`
zCClq)d(EPZ)s*<YLVIrxpt;1ciYl|-W#Q+}0liR*xG$opxNJ%6OdBg~rNFw;dbO?w
z-g5Pu!ca)D@5<_mqhp%gR-=!c$ef4V7>oCei`;xK<kFV9QmTE+eN|sp``*=9>nZDe
z-t)Dp&N*poE3Er>)HQouhOXtow4tzcZbQREPam2DJ(1!B0u$G0@wQ19K3x3u@i!^_
BPfq{<


From 00c25a6c963d07c5dbf0a53ac4ec9dd98fc07b4b Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 6 Jun 2018 15:10:17 +0200
Subject: [PATCH 7/9] Merge branch 'Dev_0601' into DevMultiLingual

# Conflicts:
#	src/Notepad3.rc
---
 Version.ps1                         |   7 +++++--
 Versions/Notepad3.exe.manifest.tpl  |   4 ++--
 Versions/VersionEx.h.tpl            | Bin 1164 -> 1146 bytes
 Versions/build.txt                  |   2 +-
 language/np3_de_de/dialogs_de_de.rc | Bin 72660 -> 73812 bytes
 language/np3_de_de/menu_de_de.rc    | Bin 43038 -> 43198 bytes
 language/np3_de_de/strings_de_de.rc | Bin 26676 -> 26540 bytes
 language/np3_en_uk/dialogs_en_uk.rc | Bin 72786 -> 72786 bytes
 language/np3_en_us/dialogs_en_us.rc | Bin 73076 -> 72782 bytes
 language/np3_es_es/dialogs_es_es.rc | Bin 72834 -> 72838 bytes
 language/np3_fr_fr/dialogs_fr_fr.rc | Bin 72732 -> 72740 bytes
 language/np3_nl_nl/dialogs_nl_nl.rc | Bin 73046 -> 72752 bytes
 res/Notepad3.exe.manifest.conf      |   4 ++--
 src/Dialogs.c                       |   6 +++---
 src/Notepad3.c                      |  14 +++++++-------
 src/Notepad3.h                      |   1 -
 src/Notepad3.ver                    |  10 +++++-----
 src/Version.h                       | Bin 26814 -> 25424 bytes
 src/VersionEx.h                     |   8 ++++----
 19 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Version.ps1 b/Version.ps1
index ade690f06..1a05fa537 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -32,6 +32,7 @@ function DebugOutput($msg)
 
 try 
 {
+  $AppName = "Notepad3"
 	$Major = 4
 	$Minor = [int]$(Get-Date -format yy)
 	$Revis = [int]$(Get-Date -format MMdd)
@@ -53,6 +54,7 @@ try
 if ($VerPatch) { $VerPatch = " $VerPatch" }  # ensure space in front of string
 
 	Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
+	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAJOR\$', "$Major" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MINOR\$', "$Minor" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAINT\$', "$Revis" } | Set-Content "src\VersionEx.h"
@@ -60,10 +62,11 @@ if ($VerPatch) { $VerPatch = " $VerPatch" }  # ensure space in front of string
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$ONIGMOVER\$', "$OnigmoVer" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
-	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
 	
 	Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
-	(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
+	(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$APPNAME\$', "$AppName" } | Set-Content "res\Notepad3.exe.manifest.conf"
+	(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "res\Notepad3.exe.manifest.conf"
+	(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', "$CompleteVer" } | Set-Content "res\Notepad3.exe.manifest.conf"
 	if ($AppVeyorEnv) {
 		Update-AppveyorBuild -Version $CompleteVer
   }
diff --git a/Versions/Notepad3.exe.manifest.tpl b/Versions/Notepad3.exe.manifest.tpl
index d9d81b152..e2eb5cd30 100644
--- a/Versions/Notepad3.exe.manifest.tpl
+++ b/Versions/Notepad3.exe.manifest.tpl
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
-    name="Notepad3"
+    name="$APPNAME$"
     processorArchitecture="*"
     version="$VERSION$"
     type="win32"
   />
-  <description>Notepad3</description>
+  <description>$APPNAME$ $VERPATCH$</description>
 </assembly>
diff --git a/Versions/VersionEx.h.tpl b/Versions/VersionEx.h.tpl
index 7182471bc627b1e33547ecc837abfbc0e95cc9d4..12b0aeec4e1fe291c92f0ebb93b45de0fe59765c 100644
GIT binary patch
delta 58
zcmeC-{Kc`MgGtqqApi*d7#taV8C)3@7?c=PfNW$j6$Yir8=2HM&tmFgoLs;n0{~%8
B3=seT

delta 34
qcmeyx(Zji+gJ}}8(B>;lU5t!AlVe$ACof|bn8eJ-=s4M*MH>LiGzu*M

diff --git a/Versions/build.txt b/Versions/build.txt
index eeb072e53..7d802a3e7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-997
+1002
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index 7b87b015d60388123c2b96e786029d65bdc5ca9d..8a27ade4c5e25ffed60b4433a092411926185f15 100644
GIT binary patch
delta 9459
zcmcgy4OCRuwLVuy{zPP;6GT8qLIzL}Mt+8o#5e*fQ9*(ltBE?uj|3QTfW$|v1Xp5`
zwy`n0>GUNr5A(88YhJ7Nrlqkp(Z;r>_D5Y=d0lB%)vT=d`d)stzSlNy)!MhebMBoV
z7{s(|b+O>i+<VSG`|SPgy}z?BZ;x2sK4CfXA1U;mr|opins2p>ox(0k#11iExWyJx
zMwhI`wBV5xdhZYMdSU9`6nqI>`J85<l0PNt@8#@Dp_YyFsH{9o-%+|Y29NdkE4Eq^
zT6y|b(JFjo9n7GuRrylPj{i&1U#<GcV)ck-{_*pG@L^}a@nt!zWMw>cd9D{!i*2Gs
zbnqy@=odcG&f4V*b+=U%iB-bO_gX~(HLh!?k7{$sQk|+*>*>`a+7^%K61_ZO2@mSx
zpJu*p5uJRenWuE{wT-V^`3XeyN=3R1fj++D=MlC1x065n_{UTLpZdfA?oxW~8(IZ@
zCCerkzj(@WYoxlptmGIO<XrM4_i~=!!BSg!6^HPMdeJ26`19D!jnaY|SEW(x(nE4x
zS3*z@U0!ON8nKofnY+wEbC&L+=a(&7`VQ~7%~;dLnl-Zqea8AtymFn?poVSGC$+=A
z?b3R%;~KG=ZCNBL>9)FW8LI~+lJ&0JZX0iAjcDNA6^SxYDqOVbu5YT@4ME+5`wn+C
zZ0F!L;bN@c!aBhxp;heCD~2z`JkmbQrstQx7*iq2$+P0gaX@x;#T)}<Wij(biQc|)
zn?@-mu{Pz9Ub%SyMmn54)p;03R)>?0oUl-H!!XUSpHXVUsGC)45<Svj3d?@OY`|+*
z*nJ<ZS#>7H#mYJ7x|)`W4|p7)=aXBrixvDCTLiQ^%(!6b3a;a=gZX_D%6>X`r;QFZ
zz9iRZyt_^-Bki~+x*71SDNh>W_NHrT*nwXH5*pcAhkhFR!DDgjr7m6Medt#DWc7Cv
zFb?6=$9HDwr`IHD(Z$oJYgNP-UQedQ_grzVXLG_B@D?zKW&Rk%Bk&gPS>BZ1xGrr{
zIc%b)U_dpmjhq1it2j6GN&t88CjhmZpU7~fudFZPw6u$oH^jy`#e8a<?!IHRk05Uu
z&xgOa$-U!F$kvNln&}%KJ+|RNQ&MrbP5@>TZw;RB=Bq*vU>edUZ{tZh_oU56zjfwV
z*GfGflz)+ed{lk!$5G6v4QJ5m`*u?O!DL#0ELESe$)e4zXA@vCI15*p!pvu($N;oj
zX!~Lh9eKErj%?1QMKj{*-Ob0cl|z-2$H=0i-ov~?tMrvu!V-qf=kGr8fK*sYmY@1K
z?Oxv9PK$nPp)1V`Ho?PwagDX=WHTtY!GNZI0C33TxNl}am<yS(pMP;bw2yfrM-&Pt
zm!wkiZX8S~6P5CN1vOqBFTRr>QON7+Poh&TbEa|d@=qblb#neGqwOnC7Bz`~;+6W?
zmOJ=<leA<jyUfeqysSsBc#y*rwE^yFT=xtu^d(VAcM6q!xSJmS{J{h#Yf{EiU34_l
zxw47JsXU~RZO#U+6+~2OFjr8OX{`j_n6xAFcIDP#trEc9;9-3L(IT!AN;9w24EDnw
zdS&Pa3n_ao+=4#d51{Dd`KS(n9kM<`rC+Xes4<bcI-bI6SL<RbMFrK}zaa`7xsJz_
z2`8Po{|T8ky808z-+8Tgd|Sf4u%}NZjb4e0pf&Z9?oTFB$+MO?#56;g8hg`d*lnSn
zwpgm^$<mzU?Qtb6g`zB?CF1!Hdy=g4g^L{k_d59s)p-0g<xGS}8*kG~D|^#Tso6`o
z5Y=-@!7LYpAvC+3vjopZ9Y|1AfMGz-Y;R|I*amVm^lTxgFI~^_S7-^UR!MyHI=Q0F
zZgJ7E-sFh;Y4mPy%Cs_3A(twZOJbyrlKXZ>wQ)NATi>dweu>3C-UO#My7XK&P49pG
zGh6yk{ocXVtTenI;x7+C=FMY-$EqTQlm_GgI|{#fqDth6dE#CkgI}1cgP#>KPe4j#
zw9{J;d}A>9P0qD*e%Qu{2-;69U~Tdw^XcKZ1RrwnUywVMPV@L1h#)YFku`h;D=<gm
zJ0yndQWG4#7L~%!q7Z@zZirhfg9>2<Qy_#wHP_E-LP;|{*~KXyrIuHm;7RvvdU!`6
z!azT<BT=KR1IZb+yd$5XagaW+5FZLDH4l7lii4MhH`t1@pbihjQvJ~F^!`9|wwi6`
zPq_>$v07TGjYk*o$VxhL+Co2hsF|+pjO8_xJn(FYp*hB(5N*6o#d6J@+s1iXdX+PH
zF&)`h!kHDp<YaPk(&mEvJBuXuQXT+THaseQ3{SvFitU1-V($^!)7&q#Yvr85s%lkD
z_<QA9cS(6ym(!_Ti=)Pl2M!5jS+rEzF=(GG6F==AJX4JLZD&{-Yz9tY<!|J$C!DQ3
zLxm1=AvqsLxW@Ou)S^hF1G%#aE`57{8JJ=kiVjK_t|(ij%pzyM&{Py&f&m8e5U^ZI
zMR*}uuaHkV=&-kmu9Ji8>n#Z?<AKqzlUyNGg1MNk0H;A&fQzsLnLA}jntAr}?rx1a
z(beTQ#Sa&;9l?JGA30al$8y$iSmWfTIM0o&*to8f9)31UvgS`8O^UP2TwOtzAM2!r
z4Y>^FcpBalJLdj^$CAg~doSYNzf6W*U9|7<@z^aN${wFh3kPxr!w(sex}zYDfi0ha
zZ)TL8_YXqj<X`1aRp5Q2=MS>UqAg<zm_Lz#3FbqATFC$bqp`{lPPBMv@)+I6T^c6<
z&>CROOb}~=s0)v?or5=N&d7Zz`V5vE%5EmWCtehs(PVve;)@%D7_jpJ7n!_+vpWvC
zNNIK^w(5!u51&T*f2ZMJMVUYQe5TL$^P=Ev2-DU4cLy(Bz`hDk1b>s@Fu8Zj<k3Re
zU+$h@yU+z-RVV7dWy2Fl7-Z4;VXA$WEl(hNlw@PmY)sST^V#+E^phJ0Ri#xysdkE#
zZ>pj?2XOuXGh!S9&G5C0d-#-s>IR%)4g!6rQMt#Lhk~F^I$bQUbtZ>ohb*yJ1jGoW
z3C9U3knY*rpdZ?ss?~zKAeE{!lVavKEKV!{=YTfW**tTAQ_J?(RB$GfSuG&%Q(F=o
z0tEVx;(~tWsRAvbk*7*c^uO#Y)ux2?TgXjY(j0sw-X?7ktoQT^9k)4zn&=Pb0rb#U
zpQJ07EeXLhA=#ekj6+K0-O!`Yj2K-&KBG|e*GA$RRGy;0e(kjcGhO)T&A@B!_v8~l
z^FHMXlfJ7$tx6a=dHv#o(H@Z}GqHdUe7(bF&W@PN<v3fP|Id@ODPfb)wV?ISUQZ91
z9c0z0j4W>3bL~viR<aRVc(Gn7<l1ww8oijCMOpjrofeu1SFYC|-M@WO6f&X>d#8pE
z^{dm%dJF9tUOi16{DO>>wEeg0i3eWLB!3x>(^CKSmoI7>+#1l^Ub?EKFJY%4(PGyo
z8|QRIo9@iq030A0D|Q~jdZ^6+d@D=l8?*vwE8sbxHlZ0Xgi3}64(Za%XQFHl9bL0k
z+jH<b6B<YvGn?;i<sk6MRYHstShc^A)3lVIH5;oV3x#(8qR9&B4$V#CgjlI(z2zAf
z%{qPWp>dj0nRMb6hyLHM+^uCQ+b9QgF{x8$Q&_j3F8x;(o&9bz{q9>e<LrIaw{t)(
z@>cS?s{Hx6RDx*W^pelu>5&<JflNzw8mdgs0963Pw)0sK$5mWqSAs4Tmfvbda-<a^
z<kQh__a{_xT`R;)YMfK$j(8qiANj16;fwsGdNw%os{@SB(CC1k8N<h4I?!R$?Bva?
znhpJw^q^*Z2Q*7{PD*IsLq&AO9Zw&8FGb&dI8~#C89AjZc`?<EgDKE9K`q4{we(mM
z`{<3=X3<MW{jz1Aq{qh@b7*K_7A@2lWrmkUbqEZ~<+=To`f8306ugGeSG-!GW!Ccc
z&<H_#j_%HvqquVDdmqx-eK~bC(qIUY@WzSRUfIfxAnteavv9~oGyOa|{QaUh#rn&@
z(C;v<6K%99f2`KyIw>1Ys*p_tJNG+G*BHQ}-_({;q&+if^J|MIuxCK$-lCQnNqSUE
zTQ+(*%MAVC3G0~S5U0l5_)J<xJwH4j#kkhNbZR*+J8}B(@mS5!LZxklEXpb%%3!5S
zt`1HKx#+%FQAkx#se0)PcHoD8`rI@RKZQq(rUW&f&Xc{>h9MW9Cyqr`B!l+8HG@)~
zm_zTJeBGwdrSvE=^ysE@Z{|&L$>8GC6^EC0%0)?U9;BH)v8716=o`phEe94t+)TEh
zt!Tft^FGjIQGr%K``p>qavAU{s7$FBAhCS3L?ACDvt)dkRQcoNI8a+YQPS@>rpY*1
zm7-Y!pG?(~Y0r;8q1`{3&hPOQ>klPeZb7(%FKbv&l^#HdR3jy{x`(meC;igQdj@au
z(Vf)=F?^0C_JF&|h%zLZ3&wuo$8cFH_Jg#5EyNX;8cr9muS#elU*+q^-kPaZ0g+~K
zn2RaygLGi_K=YYgfzY%v=P>$Z+?Phjg~3#yY8#XTX9}OEf;nU$p!xin=Sv;3njn$f
z{9Fbh{pjac#|58^f&jY-uR?P5lJoJC_yFE;wobMvTy*Z&ocJ<wmxm`J)HG-j-skr*
z$Z!wI$Y=1hZXTx&V+fo9wu7Xdlzr|nAMZT}GfjvjQ{wqttwJw8pP*K^(UHe<G92PA
zmH_%($9=WWGjN*tGx|Wk`gL_Stf4Grj;QArsybc$!}MPLPK4gexvRvwMX@%&FkzVf
zBlP-tn#R40cR#fOnCKFjT>zO^7=Byu(j^aXxm7MxX92_=x{azvnsa^ho6UpVe&>oY
z7cg~5a*xQn@vNiXPBkk7bw-8CXibb4G~Ax%R|&<6_9%xc*#J4{3i_X@auM^X;0s%f
zdM4kY6{|XnJcy$a#@=8y=Z)<bS|_7s$$pi4>};ipgJBD8z`_y2>ZBc(r>Xp+DTjAK
zS$XlbMWUDq53G&6Tg0GM!GiC|Tc{6qDGPxjtBmxMkK5INGKftDc`i0ham%c4YFRb6
z+o(&b2e(aTcKp+T%4rdAbm`=!4r70;*V5p-QPxW76z*qJr+jfYKUZOlYbR?Tk(}t8
z?{{+OPWXZg|Avu7$sgn}2%I1MJM}E~gI904C-~;dZk*asNQ;dBEKr~`l|d1P6LEJm
z`B5%L2{6wID1#^*sw9JjS{*jB&zMP@+miI;4|6rmMV<dy_w?~tvV5FM8}DBdB})19
zz}fGwAAO0Ay>&}q<}F$x4S3WhexX%U=i&#kjoR>SIHD?Vc4L8;plXpDk=)_$SCrez
z^uouV&I-dM8%237l%Uno!Fb{N^pIt;ItO!b%d*!v{f;>0_FjI^+9`p<Jbt>{3b7!t
zCQSRdD_=`jt|Wzx8NFC52d9%RdT-%zv9$O1vBp?VBJMF`Svm*?{?7yn30k0*pwRa+
z0*u2h*G=oLVpC>9xhR)`f>!bP?^+83znh`GKxhAFn2xNA54;|)rRsbC_hOvp*0){L
zEirC>bL;u@rjbW9ZC;G=?Y=<jWbHH;KYk(05APefJyv@;k<<G2KcoljaoVy#SE^PM
z*kjf9jJo-=QQs>@I1|6hup1e&X><7+;A?<=l^Cc`*RD^l<@!|<7|PUUjqIGRt&918
DS$6HN

delta 8315
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
RB?G42Od0z9Y;!}%{{u>ZCRG3c

diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index a4405110d9e25b041a3b1c0cdcb38853120de940..e6efa3ae45cd58938b6c16bda1f7a1f16191214c 100644
GIT binary patch
delta 774
zcmY+C%Wo1<6vhvarpQwnAf*NiB>~!iEsYCJg9eZ;d^Au)Rah9Tq~gF>c}O)T7)$8G
zN7TbYy6}-Mx-*S;;jXdU8Vxljji!nESC|+Vo;$5cS<KwIGjqQ0cfNC9ww3E!%C$cl
z>uJb98M2UrA@IN$t$D~|SPbJ+qlS$i@Tu{qTZ2o6<M_Fu#duB2HVrAwbFUGP+EUn`
zwqQ@gs2YP47;IS4Z!@#6Hl<1tz-@bt?i+Rim!D{v)SK5iB4m_-B3zXXxveDI#^4&{
z@RS&3!yczv5nzeIPiAizDo}zdRa_@1C-?~P0@V;8hy<O3n^Zr5!BE;1fEev1(*6rm
zAY!m;$F|;rai1C6m(;iuil_oG!TL_FbRAAYfrO`I*&K=epvy_(1%kLzu(F-#JH2jC
zi5Mh&7GK@JXQK(1!r_D41W=^PjEqx}(KuWY2H5n(#~yo_h)Tr8t;%wzleEi1l>(09
z>y{cf=k)kM9Kkbr;uOE=?odUU1ZTm?Ugbws?sN2ej$Y;E_IR;Gj-Aa8rCrQ6b4(C;
zMq#p_ChCIxYZ*5#3;1DJkF#^%@!$=$sk$e~F=+yLt1j4idJ@fm$I!t{GwmZTHNLG!
zx_3=I?05Z*g2GH<tFc0B3Pba5TyOYsVLo*zKsk2O@lmWj>Sae3l!`9?c@kZV@2PN{
zeOnZ{Qk=yeZu5up%<<UNjrVmH@BeHs5>%1$y-RC_8Vk@7-~n;?e(>Y3nw>S9_f#f+
jruLmJ+&U|;!51S+LlS1FwcS%*!bDm?V@u1L%S(oTXC2fZ

delta 652
zcmX|<OK4L;6o$_v*EG$eH>PQbk#eJph!wSz3KnT-LfnXGOsf?aLXyTb<mM*c<{=`~
zg-L5wEIs(bA{7@Z6p75jow(}82hE~XTngQ~bWs#NGmSDZkMsP_&%AG2o~>J2+jeId
z;*f$0WFgPh?yHJ(oURqPPJ0Mv-BJF@ownopAqU>{dGSM^4JZ6DeB%$I5eanc9{$~L
zv9b_u?U{9FpafHpr+gE#ydJDO`@#^TXNnAII`gudfq#}K`Bd1Uuu)zb`0T~x4Ifta
zCwEU!%(WdNFbJfI?a_lc77ya$c?CU@nA3z`kb%N~pJyPzS0Wd8VGC{C7hiK(Mb=j0
zr8xPcbNiUHMpPzD3o5>m{1{Nf5T)ufM3W(N1=a2-y7VF3&N`M(*>SAVgKNeSY`GL{
z>dSnvc--25lA<LM<RAp6JG1E0n#a^xjjxu6d({~^Y7VMUq!0tu5e>b!zKx7iE0Z{M
zTB49BGA(aHev@8t@)rK(?Z`x0X0hGWFrh1WrV+zP(vGj1KEB$x%UBgp%)P)br5^k-
z=f}&M2UkKi;$NycaB%*TD%2KJiW#er=FjJkGFHQl+wYjc?=KV>EA!uXHW@4O&3kIs
zu?teBkkqCw;HiDJgDNC62y#-w3iY$(%Msq;hZ+w*ShRNige$ZRe0!jme|<b;*_)69
Z=V(un7)6RNQ$_jT@b!~^KKyjS{TJ6r!2JLK

diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index 693d1aefc4dccb19c0290133d07a9a99eaf8d4c0..8a5b6066be12f95b95c41cb3f37dbb0d3e19914f 100644
GIT binary patch
delta 33
ocmdmTfpN`w#tkg|oK6g>K$ypnvRROSJ<H@xA_kjFL=FT40K6Xy2><{9

delta 64
zcmZ2;o^i_s#tkg|tYHkP3`LW3{p2SJ@@+Qa?_!zE#Hlb@fKvzqC-Cx2Ht~|%d`I{~
FFaTQO5(@wT

diff --git a/language/np3_en_uk/dialogs_en_uk.rc b/language/np3_en_uk/dialogs_en_uk.rc
index b66609de766f187122b228263b0379612feb407f..c3ed7df6e79c1c44fc2f52dd19e9c5887aacbc60 100644
GIT binary patch
delta 22
dcmcb#gXPi=mWC~ia#Gusq!<mDSa=z@7yw^~1<L>c

delta 17
Ycmcb#gXPi=mWC~ia#Gu+q!>+@079DutN;K2

diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index da967a651531c349651d1d0d594d631c245cf20e..22e829e7027747eae47b69cf6c0f167db7caedf6 100644
GIT binary patch
delta 23
ccmeyei{;!7mJJ1eH_!WbO^$<?fr|lz0gosM(*OVf

delta 18
acmX@NgXPOEmJJ1eCky=M*zEP^k30Zj4hj?i

diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index fcec1aef42668ffa813c3259d5cc10583d93e970..68ba32d3526ab568a6e146f7a8ea83889b6e184b 100644
GIT binary patch
delta 42
xcmZqL$<nryWrGv*<V~NKZGOURzyf4!YCgoV{SXIZmcaC95{y#Yy(Aeem;t0#5nTWP

delta 45
zcmV+|0Mh@4xdei_1h7H_k?Nwe=mRhWmzo;^o|Ete4ui-Dx5x+qY!H*u2OhUh838y0
DwUrSg

diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 63cb201a61c8c95ba27fb5e48ac203288637a12b..4fabe1883b5ac9d520f18c4d353844a42c312e69 100644
GIT binary patch
delta 27
jcmbQUgJsDMmJRpVCp$4OYi{7!-oU{)N0^0|fr|kEof`<@

delta 23
fcmZ3ogJsSRmJRpVr&~xf&TDSq*xtawxIh>HcDM-D

diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 2d1cae34e8b5ce7fd5aac46fd3bfbfe8c150801a..7bee68fd8b39f534063b57470460c83829101a48 100644
GIT binary patch
delta 18
acmcb%i)F(OmJLyVH+TFyCpY;XI|l$_FA1#x

delta 14
Wcmdn6gXP*TmJLyVH|zZQBM$&N?g#z=

diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 31b99ad39..dbab4efb1 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="4.18.605.1001"
+    version="4.18.606.1002"
     type="win32"
   />
-  <description>Notepad3</description>
+  <description>Notepad3  X_MUI</description>
 </assembly>
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 7c6e4656b..7741194e5 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -447,7 +447,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
   case WM_INITDIALOG:
   {
     {
-      SetDlgItemText(hwnd, IDC_VERSION, VERSION_FILEVERSION_LONG);
+      SetDlgItemText(hwnd, IDC_VERSION, L"" VERSION_FILEVERSION_LONG);
 
       if (hFontTitle) { DeleteObject(hFontTitle); }
 
@@ -599,7 +599,7 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
     case IDC_COPYVERSTRG:
       {
         WCHAR wchVerInfo[1024] = { L'\0' };
-        StringCchCopy(wchVerInfo, COUNTOF(wchVerInfo), VERSION_FILEVERSION_LONG);
+        StringCchCopy(wchVerInfo, COUNTOF(wchVerInfo), L"" VERSION_FILEVERSION_LONG);
         StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n" VERSION_SCIVERSION);
         StringCchCat(wchVerInfo, COUNTOF(wchVerInfo), L"\n" VERSION_COMPILER);
         SetClipboardTextW(g_hwndMain, wchVerInfo);
@@ -718,7 +718,7 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam)
               ExpandEnvironmentStringsEx(arg1,COUNTOF(arg1));
               ExtractFirstArgument(arg1,arg1,arg2,MAX_PATH);
 
-              if (StringCchCompareIN(arg1,COUNTOF(arg1),L"notepad3",-1) == 0 ||
+              if (StringCchCompareIN(arg1,COUNTOF(arg1), TSTRG(APPNAME),-1) == 0 ||
                   StringCchCompareIN(arg1,COUNTOF(arg1),L"notepad3.exe",-1) == 0) {
                 GetModuleFileName(NULL,arg1,COUNTOF(arg1));
                 bQuickExit = true;
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 92c1a7907..82cef699f 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -47,12 +47,12 @@
 #include "../uthash/utlist.h"
 #include "encoding.h"
 #include "helpers.h"
+#include "VersionEx.h"
 #include "SciCall.h"
 
 #include "notepad3.h"
 
 
-
 /******************************************************************************
 *
 * Local and global Variables for Notepad3.c
@@ -348,7 +348,7 @@ int   iSortOptions = 0;
 int   iAlignMode   = 0;
 
 bool      flagIsElevated = false;
-WCHAR     wchWndClass[16] = WC_NOTEPAD3;
+WCHAR     wchWndClass[16] = L"" APPNAME;
 
 
 HINSTANCE g_hInstance = NULL;
@@ -1079,7 +1079,7 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
   g_hwndMain = CreateWindowEx(
                0,
                wchWndClass,
-               L"Notepad3",
+               L"" APPNAME,
                WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
                g_WinInfo.x,
                g_WinInfo.y,
@@ -7012,7 +7012,7 @@ void ParseCommandLine()
                        lp1 + CSTRLEN(L"appid="),len - CSTRLEN(L"appid="));
         StrTrim(g_wchAppUserModelID,L" ");
         if (StringCchLenW(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID)) == 0)
-          StringCchCopy(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID),L"Notepad3");
+          StringCchCopy(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID), L"" APPNAME);
       }
 
       else if (StrCmpNI(lp1,L"sysmru=",CSTRLEN(L"sysmru=")) == 0) {
@@ -7393,7 +7393,7 @@ void LoadFlags()
     g_flagNoFileVariables = 1;
 
   if (StringCchLenW(g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID)) == 0) {
-    IniSectionGetString(pIniSection,L"ShellAppUserModelID",L"Notepad3",
+    IniSectionGetString(pIniSection,L"ShellAppUserModelID", L"" APPNAME,
       g_wchAppUserModelID,COUNTOF(g_wchAppUserModelID));
   }
 
@@ -7461,7 +7461,7 @@ static bool __fastcall _CheckIniFile(LPWSTR lpszFile,LPCWSTR lpszModule)
 static bool __fastcall _CheckIniFileRedirect(LPWSTR lpszFile,LPCWSTR lpszModule)
 {
   WCHAR tch[MAX_PATH] = { L'\0' };
-  if (GetPrivateProfileString(L"Notepad3",L"Notepad3.ini",L"",tch,COUNTOF(tch),lpszFile)) {
+  if (GetPrivateProfileString(L"" APPNAME, L"" APPNAME ".ini",L"",tch,COUNTOF(tch),lpszFile)) {
     if (_CheckIniFile(tch,lpszModule)) {
       StringCchCopy(lpszFile,MAX_PATH,tch);
       return true;
@@ -9611,7 +9611,7 @@ void ShowNotifyIcon(HWND hwnd,bool bAdd)
   nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
   nid.uCallbackMessage = WM_TRAYMESSAGE;
   nid.hIcon = hIcon;
-  StringCchCopy(nid.szTip,COUNTOF(nid.szTip),L"Notepad3");
+  StringCchCopy(nid.szTip,COUNTOF(nid.szTip), L"" APPNAME);
 
   if(bAdd)
     Shell_NotifyIcon(NIM_ADD,&nid);
diff --git a/src/Notepad3.h b/src/Notepad3.h
index c9371027d..da6a1ea12 100644
--- a/src/Notepad3.h
+++ b/src/Notepad3.h
@@ -19,7 +19,6 @@
 #include "TypeDefs.h"
 
 //==== Main Window ============================================================
-#define WC_NOTEPAD3 L"Notepad3"
 
 #define ONLINE_HELP_WEBSITE L"https://www.rizonesoft.com/documents/notepad3/"
 
diff --git a/src/Notepad3.ver b/src/Notepad3.ver
index c10ee4639..47f60aade 100644
--- a/src/Notepad3.ver
+++ b/src/Notepad3.ver
@@ -37,15 +37,15 @@ BEGIN
   BEGIN
     BLOCK "040904b0"
     BEGIN
-      VALUE "Comments",         APPNAMEA
-      VALUE "FileDescription",  APPNAMEA
-      VALUE "InternalName",     APPNAMEA
-      VALUE "ProductName",      APPNAMEA
+      VALUE "Comments",         APPNAME
+      VALUE "FileDescription",  APPNAME
+      VALUE "InternalName",     APPNAME
+      VALUE "ProductName",      APPNAME
       VALUE "CompanyName",      VERSION_COMPANYNAME
       VALUE "FileVersion",      VERSION_FILEVERSION
       VALUE "ProductVersion",   VERSION_FILEVERSION
       VALUE "LegalCopyright",   VERSION_LEGALCOPYRIGHT
-      VALUE "OriginalFilename", APPNAMEA ".exe"
+      VALUE "OriginalFilename", APPNAME ".exe"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/Version.h b/src/Version.h
index 0b056fd2609fc9244b0d2b384ad9b84c2d973711..f40185e7e019d28a00613314832e5a8e35e45049 100644
GIT binary patch
delta 114
zcmdmYk@3PY#tlEXCm-PXwpoJTgmLmUX@$ubcqAqp2=PoV5fqyoAfz^#LxgW~n-EY;
zL~imvp!hsa0iXsAu$m{rMsT@bBI_mx2r5lJBWl9vGx@)$F_g!(IYCT?W%Cp%Ek6KI
CASaLj

delta 569
zcmca`jB(#Z#tlEXSsfVy7y>4H3(HPCAU64d5R0H6Lq0<ZLn=c7Ln1>8gE52BWJ76j
zUZ5fdKL$qzUj|nO$H{@Rx|r%V-{<CMWDJ@7mPeD@he3%!4~P{QLMF@dYI4H)lRqk&
zPdp$6R5q7a6-C)w9_h(Xc*Q2a;+C1bOHyj`EgqrG?|4iYne`d;Cm-~coqRx$YqFn!
zf}sM?RFHY-4pm^#U@&7aVbEnrV#ow~K@+GB;sT(H#6da~7@QbNfpR%Ok0Inh)(T9X
zCZqr|T@qxv0??z#9tPVuxth<E(P#2{KJ&>lgg{PI6GT_%IJulpo6&LdLOyk{7as5l
zp}Srgx9iK`Ax46GC!6q_5Omc=DbdMG_*9^7;+VXEe+`hWGC5DcWbzULBPg3|@~T83
jVDQULJ|!r#*-!8WGp`RYu#y;xfGMGfp>ngbsIDIXtm=tj

diff --git a/src/VersionEx.h b/src/VersionEx.h
index 66d463cbe..26d962847 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -3,11 +3,11 @@
 // this file is generated - use template to apply changes  //
 //                                                         //
 // //////////////////////////////////////////////////////////
+#define APPNAME "Notepad3"
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 18
-#define VERSION_REV 519
-#define VERSION_BUILD 997
+#define VERSION_REV 606
+#define VERSION_BUILD 1002
 #define SCINTILLA_VER 405
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH L" X_MUI"
-#define VERSIONA_PATCH " X_MUI"
+#define VERSION_PATCH " X_MUI"

From 84556c404c8662b16152e18945f9211b0f1eb934 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 6 Jun 2018 15:18:52 +0200
Subject: [PATCH 8/9] + add: last chunk of German string translations (dialogs)

---
 language/np3_de_de/menu_de_de.rc | Bin 43198 -> 43164 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index e6efa3ae45cd58938b6c16bda1f7a1f16191214c..7147fcea30ac802c8a0bce004259cb73f7549ab7 100644
GIT binary patch
delta 56
zcmdmYk!j9FrVT8dn*}%@$Ox-3q%tHj6fq<L=}d+aAelG$|D5p6DQaG>lLa^(Cdai1
KZRW|@WCH*KU=m9J

delta 102
zcmbPpk!jyWrVT8d-1-b^3~mgW3^@#`lP@lGoZQF9vDt@nhKy_~Ln1>FLlQ$OP_hI_
q<}rYjx-z7I_+X`SbHz6Msd>4A%?JYur!tg-C2U%RHowZ=WCH-$6drm2


From 0fe58248afb6ca0054424c21bc1a3fb0487a8b6f Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 6 Jun 2018 16:34:55 +0200
Subject: [PATCH 9/9] + fix: wrong language interface lib build in release mode

---
 Notepad3.sln                                  |   5 +++++
 language/np3_en_us/np3_en_us.vcxproj          |   8 ++++----
 language/np3_nl_nl/np3_nl_nl.vcxproj          |  16 ++++++++++++----
 .../App/DefaultData/settings/Notepad3.ini     | Bin 5468 -> 5508 bytes
 src/Helpers.c                                 |   4 ++--
 src/Version.h                                 | Bin 25424 -> 25422 bytes
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Notepad3.sln b/Notepad3.sln
index d4fb8bdae..34d8abe18 100644
--- a/Notepad3.sln
+++ b/Notepad3.sln
@@ -4,9 +4,11 @@ VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}"
 	ProjectSection(ProjectDependencies) = postProject
+		{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
 		{5877B917-512B-49F5-B514-1B4159E7A9CA} = {5877B917-512B-49F5-B514-1B4159E7A9CA}
 		{146D0122-33C6-4C1B-9E7A-178DEC80842E} = {146D0122-33C6-4C1B-9E7A-178DEC80842E}
 		{C8E80B4C-C0FD-4119-A05A-AB372A61007F} = {C8E80B4C-C0FD-4119-A05A-AB372A61007F}
+		{9B31015C-CB08-4B4B-A957-313A93F862F5} = {9B31015C-CB08-4B4B-A957-313A93F862F5}
 		{EC255B64-2C2F-4CB6-9D40-4542893FE5E6} = {EC255B64-2C2F-4CB6-9D40-4542893FE5E6}
 		{3B8C289D-FF47-4237-AD7B-0702230F41A3} = {3B8C289D-FF47-4237-AD7B-0702230F41A3}
 		{ADCA49F0-D91B-4AB9-913A-5840DCA8C79E} = {ADCA49F0-D91B-4AB9-913A-5840DCA8C79E}
@@ -43,6 +45,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_en_us", "language\np3_en_us\np3_en_us.vcxproj", "{9DC82B0D-2484-4925-92AD-1237C64CCB78}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_af_za", "language\np3_af_za\np3_af_za.vcxproj", "{C8E80B4C-C0FD-4119-A05A-AB372A61007F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_nl_nl", "language\np3_nl_nl\np3_nl_nl.vcxproj", "{9B31015C-CB08-4B4B-A957-313A93F862F5}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/language/np3_en_us/np3_en_us.vcxproj b/language/np3_en_us/np3_en_us.vcxproj
index 58f29c344..6542cc329 100644
--- a/language/np3_en_us/np3_en_us.vcxproj
+++ b/language/np3_en_us/np3_en_us.vcxproj
@@ -109,7 +109,7 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
@@ -134,7 +134,7 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
@@ -163,7 +163,7 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
@@ -192,7 +192,7 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\en-US"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0809 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0409 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\en-US\np3lng.dll.mui"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
diff --git a/language/np3_nl_nl/np3_nl_nl.vcxproj b/language/np3_nl_nl/np3_nl_nl.vcxproj
index 42dff1851..4ed617fee 100644
--- a/language/np3_nl_nl/np3_nl_nl.vcxproj
+++ b/language/np3_nl_nl/np3_nl_nl.vcxproj
@@ -109,7 +109,9 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
@@ -134,7 +136,9 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
@@ -163,7 +167,9 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
@@ -192,7 +198,9 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)..\nl-NL"
-"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\np3lng.dll" "$(TargetDir)..\nl-NL\np3lng.dll.mui"</Command>
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -q "$(SolutionDir)language\DoReverseMuiLoc.rcconfig" -v 2 -x 0x0413 -g 0x0409 "$(TargetDir)$(TargetFileName)" "$(TargetDir)$(TargetFileName).discard" "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+"$(UCRTContentRoot)bin\$(WindowsTargetPlatformVersion)\x86\muirct.exe" -c "$(TargetDir)..\np3lng.dll" -e "$(TargetDir)..\nl-NL\np3lng.dll.mui"
+</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>MUI Split</Message>
diff --git a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini
index 5b9767a406899208e4ebf794bca582628999dc4d..82fb6ba1dbd9e8285077152b8fd0aed66e12e4fb 100644
GIT binary patch
delta 24
gcmcbk)uO%Om@s<~Ln%WsL&;=+A;rzdgr_kA0BiCHEC2ui

delta 16
XcmZqCzN59_nDFFBLJFJtM9LTeJlF;@

diff --git a/src/Helpers.c b/src/Helpers.c
index 8c313ba65..6ac498491 100644
--- a/src/Helpers.c
+++ b/src/Helpers.c
@@ -286,10 +286,10 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID)
   // Display the error message and exit the process
 
   LPVOID lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT,
-    (lstrlen((LPCWSTR)lpMsgBuf) + lstrlen((LPCWSTR)lpszFunction) + 40) * sizeof(WCHAR));
+    (lstrlen((LPCWSTR)lpMsgBuf) + lstrlen((LPCWSTR)lpszFunction) + 80) * sizeof(WCHAR));
 
   StringCchPrintf((LPWSTR)lpDisplayBuf, LocalSize(lpDisplayBuf) / sizeof(WCHAR),
-    L"Error: '%s' failed with error id %d:\n%s", lpszFunction, dwErrID, lpMsgBuf);
+    L"Error: '%s' failed with error id %d:\n%s.\n", lpszFunction, dwErrID, lpMsgBuf);
 
   MessageBox(NULL, (LPCWSTR)lpDisplayBuf, L"Notepad3 - ERROR", MB_OK | MB_ICONEXCLAMATION);
 
diff --git a/src/Version.h b/src/Version.h
index f40185e7e019d28a00613314832e5a8e35e45049..605c7de97ff5bd308a038dbec9098660ba278687 100644
GIT binary patch
delta 14
Wcmca`jPcwt#tn-EHZKua69fP_UIz34

delta 16
YcmX?ijPb%T#tn-E7=1P`6j&Ps07E+mKL7v#