From e13bd5830c88afd11e165810159757b88728473a Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 10 Jul 2018 11:12:57 +0200
Subject: [PATCH] + fix: hard-coded "Custom. Scheme" dialog text moved to
 language aware resources

---
 language/common_res.h               |   1 +
 language/np3_af_za/strings_af_za.rc | Bin 33270 -> 33404 bytes
 language/np3_de_de/strings_de_de.rc | Bin 36996 -> 37116 bytes
 language/np3_en_gb/strings_en_gb.rc | Bin 33298 -> 33432 bytes
 language/np3_en_us/strings_en_us.rc | Bin 33976 -> 34102 bytes
 language/np3_es_es/strings_es_es.rc | Bin 33830 -> 33964 bytes
 language/np3_fr_fr/strings_fr_fr.rc | Bin 33258 -> 33392 bytes
 language/np3_nl_nl/strings_nl_nl.rc | Bin 33862 -> 33996 bytes
 src/Styles.c                        |   7 ++++---
 9 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/language/common_res.h b/language/common_res.h
index 334621acb..8813d6c68 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -123,6 +123,7 @@
 #define IDS_MUI_ABOUT_RTF_1             15029
 #define IDS_MUI_ABOUT_RTF_2             15030
 #define IDS_MUI_TRANSL_AUTHOR           15031
+#define IDS_MUI_ASSOCIATED_EXT          15032
 
 #define IDR_MAINWND                     16000
 #define IDR_MAINWND48                   16001
diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc
index 128514d0d439f2052c3e37df24e82ac1d384d4e3..803b68bc79f61005c0f3e0a9571b34ab5e9fa9d4 100644
GIT binary patch
delta 133
zcmey?%=D*)X+uN+vjT(e=I8)M=E+gQQmMfV!3_Qk&J3Omjtn6Tt_&^=@jx;H$W}mt
zN<i6SAk1e-X2@hnWGG=sWk><arvZ66Kz1HbEEh;C0C5FaHV>#e6Q~|UTTS*A3f;Ua
H*hdclUV9tV

delta 27
jcmey<!t||~X+uN+vlWBF=I8)M=E)ZIe49T6_virtlL87I

diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index 601fd1d944fb6a007063ab18d4f4114fc5427430..374adf1c2ca7e9a7e155879b8591969ed3a8873e 100644
GIT binary patch
delta 121
zcmZo!$n<9+(}r!4tO^Xe3<{IaM@VnJ5_yMdvWAyTa4>^EgENCCgCj!-gDZmzLp+d-
z0J0U3pb|qALn%W#Ln=c)LlHv?LmrS-0>lbH^@(6sCXlRTC;*D(F<4DjWEb7MFXosr
E04+xx5C8xG

delta 27
jcmeyfkf~)M(}r!4%vKBvlg~#;Z@w0JhiS7$>=k1GrL+sT

diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc
index c0126d2e578a4da504674c59254b7486b0a8f24d..e66f38a988cf2c51b994aa374dc570602bccaaf5 100644
GIT binary patch
delta 99
zcmbQ#!Zf3mX+uQ-vjT(e=IQ`O=E)sqGUmYy{tV6xo(zr*Aq=hzE)4NNG6Kj}K!Qp@
p*<v8fXGmtqWJqKvVMv{P(NTQz5<?;8Vg{?pg+ig5PX&AE0RT~t7S{j(

delta 27
icmbQy$~38kX+uQ-vlWBF=IQ`O=E)U8ewzbAJoEs7=Lp9D

diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc
index ad582390722aa952537ee57c4a268427035b0b8d..28cb7d1fd7105ab54e7a33cca5d2e57798a15aab 100644
GIT binary patch
delta 129
zcmdnd$+WGDX@i3wvjT(e<lDZon-l!jFirj;Bo!OX5X|7u;LPC3;K&fd;L6~_5Dz3H
zfNTXIR04_?17SWxGD9XqB0~v7DnklTJPpXp0kZReV!1$C0f;NWvUxz&nLza*+G_Ga
LmC(&mfpNwF1702{

delta 31
ncmdni#k8Z7X@i3wvlWBF<lDZon-l!jFik$8;<x!mV4N`kzZMKa

diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc
index bd5b26173f8c6b43a504ce8228dcf944d3e8c404..0e5fde4b694a5d6dba291b53757fd46ecd78c02d 100644
GIT binary patch
delta 103
zcmZ41!L+86X+vKCvjT(e=7|A}%#-g0N?1EG1OuTzgENCCgCj!-gDZmzLp+d-0J0U3
rpb}8F7zpzjk{L1?5*bPuQYXK66rX&=P>8vh!D_OgQRwCe!EOcs<|-IW

delta 23
fcmZ3}$+WD4X+vKCvlWBF=7|A}%$p@brWgPKWljgq

diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc
index 2cf114b218ca0685d756d83f291e42e9440cac15..1404c05b23bf38e62c19adb2db21ce768727771b 100644
GIT binary patch
delta 103
zcmaFW%=Dp!X+uT;vjT(e=Ij7Q=E<)_BqmQVV=)hA@Mmyl@MLgg2w`w#aAAlCk`X|*
t0uodL$`%7*K0`7?CPN}a2}A1SgO1{pCm9Mc7c*E*4it*qyf0Ws4*(=s7?=P6

delta 27
icmey+!t|<{X+uT;vlWBF=Ij7Q=E)I4L7QDdbo2m@-U$%^

diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc
index 4c5452eddabcf8aa24cc4b4919bcedf94f7db7de..15e12201719615a31f8f6071d47b5e2468a16c5a 100644
GIT binary patch
delta 103
zcmX@s!E~mRX#-CHvjT(eX8r(1=E*UE64s6k!9eKG;LPC3;K&fd;L6~_5Dz3HfNTXM
rs05TP2Eu%XWQI(JM1~TE)XBMy;*+fmg_w&OtR_3MiEfq))-VJBU$GS5

delta 31
ncmX@p$#krPX#-CHvlWBFX8r(1=E)vxe3R!GI&6Lt{K5bLqmT-?

diff --git a/src/Styles.c b/src/Styles.c
index 1ad09d8f8..523ba6b0c 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -6094,7 +6094,8 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
                 if (pCurrentLexer)
                 {
                   bIsStyleSelected = false;
-                  SetDlgItemText(hwnd,IDC_STYLELABEL_ROOT, L"Associated filename extensions:");
+                  GetLngString(IDS_MUI_ASSOCIATED_EXT, label, COUNTOF(label));
+                  SetDlgItemText(hwnd,IDC_STYLELABEL_ROOT, label);
                   DialogEnableWindow(hwnd,IDC_STYLEEDIT_ROOT,true);
                   SetDlgItemText(hwnd, IDC_STYLEEDIT_ROOT, pCurrentLexer->szExtensions);
                   DialogEnableWindow(hwnd, IDC_STYLEEDIT_ROOT, true);
@@ -6114,8 +6115,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
                   else {
                     pCurrentStyle = &(pCurrentLexer->Styles[STY_DEFAULT]);
                     GetLngString(pCurrentLexer->resID, name, COUNTOF(name));
-
-                    StringCchPrintfW(label, COUNTOF(label), L"%s: Default Style:", name);
+                    FormatLngStringW(label, COUNTOF(label), IDS_MUI_STY_LEXDEF, name);
                   }
                   SetDlgItemText(hwnd, IDC_STYLELABEL, label);
                   SetDlgItemText(hwnd, IDC_STYLEEDIT, pCurrentStyle->szValue);
@@ -6141,6 +6141,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
                 }
                 else {
                   GetLngString(pCurrentLexer->resID, name, COUNTOF(name));
+
                   FormatLngStringW(label, COUNTOF(label), IDS_MUI_STY_LEXDEF, name);
                 }
                 SetDlgItemText(hwnd, IDC_STYLELABEL_ROOT, label);