From bfe835e8a4ad61619311ac2ba39fb7991d0e0637 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Wed, 16 Oct 2024 16:56:26 +0200
Subject: [PATCH] Fix wrong messages for replacement status

---
 PowerEditor/installer/nativeLang/english.xml              | 8 ++++----
 PowerEditor/installer/nativeLang/english_customizable.xml | 8 ++++----
 PowerEditor/installer/nativeLang/french.xml               | 4 ++--
 PowerEditor/installer/nativeLang/taiwaneseMandarin.xml    | 4 ++--
 PowerEditor/src/ScintillaComponent/FindReplaceDlg.h       | 8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index ceef9aa72..5a41151a4 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -1685,8 +1685,8 @@ Find in all files but exclude folders tests, bin &amp;&amp; bin64:
 Find in all files but exclude all folders log or logs recursively:
 *.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
 			<find-in-files-select-folder value="Select a folder to search from"/><!-- HowToReproduce: Search > Find in Files > [...] -->
-			<find-status-top-reached value="Find: Beginning of the document reached, first occurrence from the bottom found."/>
-			<find-status-end-reached value="Find: End of document reached, first occurrence from the top found."/>
+			<find-status-top-reached value="Find: Reached document beginning, first occurrence from the bottom found."/>
+			<find-status-end-reached value="Find: Reached document end, first occurrence from the top found."/>
 			<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>
 			<find-status-replaceinfiles-nb-replaced value="Replace in Files: $INT_REPLACE$ occurrences were replaced"/>
 			<find-status-replaceinopenedfiles-1-replaced value="Replace in Opened Files: 1 occurrence was replaced"/>
@@ -1700,8 +1700,8 @@ Find in all files but exclude all folders log or logs recursively:
 			<find-status-replaceall-1-replaced value="Replace All: 1 occurrence was replaced"/>
 			<find-status-replaceall-nb-replaced value="Replace All: $INT_REPLACE$ occurrences were replaced"/>
 			<find-status-replaceall-readonly value="Replace All: Cannot replace text. The current document is read only"/>
-			<find-status-replace-end-reached value="Replace: End of document reached, first occurrence from the top replaced."/>
-			<find-status-replace-top-reached value="Replace: Beginning of document reached, first occurrence from the bottom replaced."/>
+			<find-status-replace-end-reached value="Replace: Reached document end, started from top."/>
+			<find-status-replace-top-reached value="Replace: Reached document beginning, started from bottom."/>
 			<find-status-replaced-next-found value="Replace: 1 occurrence was replaced. The next occurrence found."/>
 			<find-status-replaced-without-continuing value="Replace: 1 occurrence was replaced."/>
 			<find-status-replaced-next-not-found value="Replace: 1 occurrence was replaced. No more occurrences were found."/>
diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml
index 8bbc18628..b07ab0d32 100644
--- a/PowerEditor/installer/nativeLang/english_customizable.xml
+++ b/PowerEditor/installer/nativeLang/english_customizable.xml
@@ -1684,8 +1684,8 @@ Find in all files but exclude folders tests, bin &amp;&amp; bin64:
 Find in all files but exclude all folders log or logs recursively:
 *.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
 			<find-in-files-select-folder value="Select a folder to search from"/><!-- HowToReproduce: Search > Find in Files > [...] -->
-			<find-status-top-reached value="Find: Beginning of the document reached, first occurrence from the bottom found."/>
-			<find-status-end-reached value="Find: End of document reached, first occurrence from the top found."/>
+			<find-status-top-reached value="Find: Reached document beginning, first occurrence from the bottom found."/>
+			<find-status-end-reached value="Find: Reached document end, first occurrence from the top found."/>
 			<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>
 			<find-status-replaceinfiles-nb-replaced value="Replace in Files: $INT_REPLACE$ occurrences were replaced"/>
 			<find-status-replaceinopenedfiles-1-replaced value="Replace in Opened Files: 1 occurrence was replaced"/>
@@ -1699,8 +1699,8 @@ Find in all files but exclude all folders log or logs recursively:
 			<find-status-replaceall-1-replaced value="Replace All: 1 occurrence was replaced"/>
 			<find-status-replaceall-nb-replaced value="Replace All: $INT_REPLACE$ occurrences were replaced"/>
 			<find-status-replaceall-readonly value="Replace All: Cannot replace text. The current document is read only"/>
-			<find-status-replace-end-reached value="Replace: End of document reached, first occurrence from the top replaced."/>
-			<find-status-replace-top-reached value="Replace: Beginning of document reached, first occurrence from the bottom replaced."/>
+			<find-status-replace-end-reached value="Replace: Reached document end, started from top."/>
+			<find-status-replace-top-reached value="Replace: Reached document beginning, started from bottom."/>
 			<find-status-replaced-next-found value="Replace: 1 occurrence was replaced. The next occurrence found."/>
 			<find-status-replaced-without-continuing value="Replace: 1 occurrence was replaced."/>
 			<find-status-replaced-next-not-found value="Replace: 1 occurrence was replaced. No more occurrences were found."/>
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index a8500ca14..af7c235ef 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -1695,8 +1695,8 @@ Rechercher dans tous les fichiers mais pas dans les dossiers log ou logs récurs
 			<find-status-replaceall-1-replaced value="Remplacer tout : 1 occurrence a été remplacée"/>
 			<find-status-replaceall-nb-replaced value="Remplacer tout : $INT_REPLACE$ occurrences ont été remplacées"/>
 			<find-status-replaceall-readonly value="Remplacer tout : l’opération a échoué. Le fichier est en lecture seule"/>
-			<find-status-replace-end-reached value="Remplacer : Fin du document atteinte, 1ère occurrence remplacée depuis le haut."/>
-			<find-status-replace-top-reached value="Remplacer : Début du document atteint, 1ère occurrence remplacée depuis le bas."/>
+			<find-status-replace-end-reached value="Remplacer : Fin du document atteinte, continuer depuis le début."/>
+			<find-status-replace-top-reached value="Remplacer : Début du document atteint, continuer depuis la fin."/>
 			<find-status-replaced-next-found value="Remplacer : 1 occurrence a été remplacée. L’occurrence suivante a été trouvée"/>
 			<find-status-replaced-without-continuing value="Remplacer : 1 occurrence a été remplacée."/>
 			<find-status-replaced-next-not-found value="Remplacer : 1 occurrence a été remplacée. L’occurrence suivante n’a pas été trouvée"/>
diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
index 30bdb14d4..2f01e3343 100644
--- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
+++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
@@ -1560,8 +1560,8 @@
 			<find-status-replaceall-1-replaced value="全部取代：取代了 1 個字串。"/>
 			<find-status-replaceall-nb-replaced value="全部取代：取代了 $INT_REPLACE$ 個字串。"/>
 			<find-status-replaceall-readonly value="全部取代：檔案為唯讀，無法取代字串。"/>
-			<find-status-replace-end-reached value="取代：搜尋已抵達文件結尾，從上面搜尋並取代了第一個相符的字串。"/>
-			<find-status-replace-top-reached value="取代：搜尋已抵達文件開首，從下面搜尋並取代了第一個相符的字串。"/>
+			<find-status-replace-end-reached value="取代：搜尋已抵達文件結尾，從頂端繼續搜尋取代。"/>
+			<find-status-replace-top-reached value="取代：搜尋已抵達文件開頭，從尾端繼續搜尋取代。"/>
 			<find-status-replaced-next-found value="取代：取代了 1 個字串。找到下一個字串。"/>
 			<find-status-replaced-next-not-found value="取代：取代了 1 個字串。找不到下一個字串。"/>
 			<find-status-replace-not-found value="取代：找不到搜尋字串"/>
diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
index 7096b8d20..8428cce95 100644
--- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
+++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
@@ -38,10 +38,10 @@ enum DIALOG_TYPE {FIND_DLG, REPLACE_DLG, FINDINFILES_DLG, FINDINPROJECTS_DLG, MA
 #define DIR_DOWN true
 #define DIR_UP false
 
-#define FIND_STATUS_END_REACHED_TEXT L"Find: End of document reached, first occurrence from the top found."
-#define FIND_STATUS_TOP_REACHED_TEXT L"Find: Beginning of the document reached, first occurrence from the bottom found."
-#define FIND_STATUS_REPLACE_END_REACHED_TEXT L"Replace: End of document reached, first occurrence from the top replaced."
-#define FIND_STATUS_REPLACE_TOP_REACHED_TEXT L"Replace: Beginning of document reached, first occurrence from the bottom replaced."
+#define FIND_STATUS_END_REACHED_TEXT L"Find: Reached document end, first occurrence from the top found."
+#define FIND_STATUS_TOP_REACHED_TEXT L"Find:  Reached document beginning, first occurrence from the bottom found."
+#define FIND_STATUS_REPLACE_END_REACHED_TEXT L"Replace: Reached document end, started from top."
+#define FIND_STATUS_REPLACE_TOP_REACHED_TEXT L"Replace: Reached document beginning, started from bottom."
 
 enum InWhat{ALL_OPEN_DOCS, FILES_IN_DIR, CURRENT_DOC, CURR_DOC_SELECTION, FILES_IN_PROJECTS};