From b9284645b58561008b8d693c4dbb31ba5f0b1b02 Mon Sep 17 00:00:00 2001
From: RaiKoHoff <rainer.kottenhoff@gmail.com>
Date: Wed, 19 Aug 2020 18:48:35 +0200
Subject: [PATCH] + chg: convenient message box text for normalizing EOLs

---
 language/common_res.h               | 3 ++-
 language/np3_de_de/strings_de_de.rc | 2 ++
 language/np3_en_us/strings_en_us.rc | 2 ++
 src/Notepad3.c                      | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/language/common_res.h b/language/common_res.h
index 03f228011..7ebcacd46 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -88,7 +88,8 @@
 #define IDS_MUI_EOLMODENAME_CRLF        13020
 #define IDS_MUI_EOLMODENAME_CR          13021
 #define IDS_MUI_EOLMODENAME_LF          13022
-#define IDS_MUI_INF_PRSVFILEMODTM       13023
+#define IDS_MUI_WARN_NORMALIZE_EOLS     13023
+#define IDS_MUI_INF_PRSVFILEMODTM       13024
 
 #define IDS_MUI_SELRECT                 14000
 #define IDS_MUI_BUFFERTOOSMALL          14001
diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index d78be1850..041c0bd90 100644
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
@@ -158,6 +158,8 @@ BEGIN
     IDS_MUI_EOLMODENAME_CRLF   "Windows (CR+LF)"
     IDS_MUI_EOLMODENAME_LF     "Unix/Mac (LF)"
     IDS_MUI_EOLMODENAME_CR     "Old Mac (CR)"
+    IDS_MUI_WARN_NORMALIZE_EOLS
+                            "Alle Zeilenumbrüche angleichen auf '%s'?"
 END
 
 STRINGTABLE
diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc
index 5201741b9..864aaf3ff 100644
--- a/language/np3_en_us/strings_en_us.rc
+++ b/language/np3_en_us/strings_en_us.rc
@@ -158,6 +158,8 @@ BEGIN
     IDS_MUI_EOLMODENAME_CRLF   "Windows (CR+LF)"
     IDS_MUI_EOLMODENAME_LF     "Unix/Mac (LF)"
     IDS_MUI_EOLMODENAME_CR     "Old Mac (CR)"
+    IDS_MUI_WARN_NORMALIZE_EOLS
+                            "Do you want to normalize all line endings to be '%s'?"
 END
 
 STRINGTABLE
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 651c75198..e55c1651b 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -7668,7 +7668,9 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
                     UINT const msgid    = (eol_mode == SC_EOL_CRLF) ? IDS_MUI_EOLMODENAME_CRLF : 
                                            ((eol_mode == SC_EOL_CR) ? IDS_MUI_EOLMODENAME_CR : IDS_MUI_EOLMODENAME_LF); 
                     
-                    INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONWARNING, NULL, msgid);
+                    WCHAR wch[64] = {L'\0'};
+                    GetLngString(msgid, wch, COUNTOF(wch));
+                    INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONWARNING, NULL, IDS_MUI_WARN_NORMALIZE_EOLS, wch);
 
                     if ((IDOK == answer) || (IDYES == answer))
                     {