From e3455a0f7e2e8aa2c97d1f7a6d2ddfde2d83f95e Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Tue, 8 Dec 2020 18:50:23 +0100
Subject: [PATCH] Make "Line" preceding each line number on Search Results
 translatable

Fix #9224
---
 PowerEditor/installer/nativeLang/english.xml              | 3 ++-
 PowerEditor/installer/nativeLang/english_customizable.xml | 3 ++-
 PowerEditor/installer/nativeLang/french.xml               | 3 ++-
 PowerEditor/installer/nativeLang/taiwaneseMandarin.xml    | 3 ++-
 PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp      | 7 ++++++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index c7952864..6fe9c175 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -1382,11 +1382,12 @@ Find in all files except exe, obj &amp;&amp; log:
             <replace-in-open-docs-confirm-title value="Are you sure?"/>
             <replace-in-open-docs-confirm-message value="Are you sure you want to replace all occurrences in all open documents?"/>
             <find-result-caption value="Search results"/>
-            <find-result-title value="Search"/>
+            <find-result-title value="Search"/> <!-- Must not begin with space or tab character -->
             <find-result-title-info value="($INT_REPLACE1$ hits in $INT_REPLACE2$ files of $INT_REPLACE3$ searched)"/>
             <find-result-title-info-selections value="($INT_REPLACE1$ hits in $INT_REPLACE2$ selections of $INT_REPLACE3$ searched)"/>
             <find-result-title-info-extra value=" - Line Filter Mode: only display the filtered results"/>
             <find-result-hits value="($INT_REPLACE$ hits)"/>
+            <find-result-line-prefix value="Line"/> <!-- Must not begin with space or tab character -->
             <find-regex-zero-length-match value="zero length match" />
         </MiscStrings>
     </Native-Langue>
diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml
index bb9ae20d..e6088547 100644
--- a/PowerEditor/installer/nativeLang/english_customizable.xml
+++ b/PowerEditor/installer/nativeLang/english_customizable.xml
@@ -1379,11 +1379,12 @@ Find in all files except exe, obj &amp;&amp; log:
             <replace-in-open-docs-confirm-title value="Are you sure?"/>
             <replace-in-open-docs-confirm-message value="Are you sure you want to replace all occurrences in all open documents?"/>
             <find-result-caption value="Search results"/>
-            <find-result-title value="Search"/>
+            <find-result-title value="Search"/> <!-- Must not begin with space or tab character -->
             <find-result-title-info value="($INT_REPLACE1$ hits in $INT_REPLACE2$ files of $INT_REPLACE3$ searched)"/>
             <find-result-title-info-selections value="($INT_REPLACE1$ hits in $INT_REPLACE2$ selections of $INT_REPLACE3$ searched)"/>
             <find-result-title-info-extra value=" - Line Filter Mode: only display the filtered results"/>
             <find-result-hits value="($INT_REPLACE$ hits)"/>
+            <find-result-line-prefix value="Line"/> <!-- Must not begin with space or tab character -->
             <find-regex-zero-length-match value="zero length match" />
         </MiscStrings>
     </Native-Langue>
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index 36db6de0..f6078ef5 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -1338,10 +1338,11 @@ Rechercher dans tous les fichiers sauf exe, obj &amp;&amp; log:
             <replace-in-open-docs-confirm-title value="Confirmation"/>
             <replace-in-open-docs-confirm-message value="Voulez-vous vraiment remplacer toutes les occurrences dans tous les documents ouverts ?"/>
             <find-result-caption value="Résultats de recherche"/>
-            <find-result-title value="Rechercher"/>
+            <find-result-title value="Rechercher"/> <!-- Must not begin with space or tab character -->
             <find-result-title-info value="($INT_REPLACE1$ résultats dans $INT_REPLACE2$ documents depuis $INT_REPLACE3$ documents recherchés)"/>
             <find-result-title-info-extra value=" - Mode de filtre de ligne : affiche uniquement les résultats filtrés"/>
             <find-result-hits value="($INT_REPLACE$ résultats)"/>
+            <find-result-line-prefix value="Ligne"/> <!-- Must not begin with space or tab character -->
             <find-regex-zero-length-match value="la chaîne vide trouvée" />
         </MiscStrings>
     </Native-Langue>
diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
index 029f6daf..df781244 100644
--- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
+++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
@@ -1322,10 +1322,11 @@
             <replace-in-open-docs-confirm-title value="替換確認"/>
             <replace-in-open-docs-confirm-message value="您確定要替換所有打開的文檔中的所有匹配項嗎？"/>
             <find-result-caption value="搜尋結果"/>
-            <find-result-title value="搜尋"/>
+            <find-result-title value="搜尋"/> <!-- Must not begin with space or tab character -->
             <find-result-title-info value="（找到 $INT_REPLACE1$ 個結果在 $INT_REPLACE2$ 的文件中。搜尋文件量： $INT_REPLACE3$）"/>
             <find-result-title-info-extra value=" - 僅在搜尋結果中尋找"/>
             <find-result-hits value="（$INT_REPLACE$ 個結果）"/>
+            <find-result-line-prefix value="行號"/> <!-- Must not begin with space or tab character -->
             <find-regex-zero-length-match value="零長度的字元相符" />
         </MiscStrings>
     </Native-Langue>
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index fec18c27..3ca55832 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -3538,7 +3538,12 @@ void Finder::addSearchHitCount(int count, int countSearched, bool isMatchLines,
 void Finder::add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline)
 {
 	_pMainFoundInfos->push_back(fi);
-	generic_string str = TEXT("\tLine ");
+
+	NativeLangSpeaker* pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
+	static generic_string lineStr = pNativeSpeaker->getLocalizedStrFromID("find-result-line-prefix", TEXT("Line"));
+	generic_string str = TEXT("\t");
+	str += lineStr;
+	str += TEXT(" ");
 
 	TCHAR lnb[16];
 	wsprintf(lnb, TEXT("%d"), fi._lineNumber);