From 2593d64fbbc96ec1fc1761e311f0d741b062a9ca Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Sun, 13 Aug 2017 00:43:14 +0200
Subject: [PATCH] Update translation files

---
 PowerEditor/installer/nativeLang/chinese.xml         | 10 +++-------
 PowerEditor/installer/nativeLang/english.xml         | 12 ++++--------
 .../installer/nativeLang/english_customizable.xml    | 12 ++++--------
 PowerEditor/installer/nativeLang/french.xml          | 10 +++-------
 PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp |  3 ---
 .../src/ScitillaComponent/FindReplaceDlg_rc.h        |  2 +-
 6 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml
index 17a5cdb56..2305b4891 100644
--- a/PowerEditor/installer/nativeLang/chinese.xml
+++ b/PowerEditor/installer/nativeLang/chinese.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <NotepadPlus>
-    <Native-Langue name="正體中文" filename="chinese.xml" version="7.4.2">
+    <Native-Langue name="正體中文" filename="chinese.xml" version="7.5">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -341,20 +341,17 @@
         <Dialog>
             <Find title="" titleFind="尋找" titleReplace="取代" titleFindInFiles="在檔案中尋找"  titleMark="標記">
                 <Item id="1" name="找下一個"/>
-                <Item id="1721" name="找上一個"/>
+                <Item id="1722" name="往上搜尋"/>
                 <Item id="2"    name="關閉"/>
                 <Item id="1620" name="尋找內容: "/>
                 <Item id="1603" name="僅符合整個單字(&amp;W)"/>
                 <Item id="1604" name="區分大小寫(&amp;C)"/>
                 <Item id="1605" name="規則運算式(&amp;E)"/>
                 <Item id="1606" name="循環(&amp;D)"/>
-                <Item id="1612" name="上(&amp;U)"/>
-                <Item id="1613" name="下(&amp;D)"/>
                 <Item id="1614" name="數量"/>
                 <Item id="1615" name="全部尋找"/>
                 <Item id="1616" name="標記該行"/>
                 <Item id="1618" name="每次搜尋都重新標記"/>
-                <Item id="1621" name="方向"/>
                 <Item id="1611" name="取代為: "/>
                 <Item id="1608" name="取代(&amp;R)"/>
                 <Item id="1609" name="全部取代(&amp;A)"/>
@@ -995,8 +992,7 @@
 			<word-chars-list-warning-end value="  在你的單字字符集中。"/>
 			<cloud-invalid-warning value="無效路徑"/>
 			<cloud-restart-warning value="請重新啟動 Notepad++ 以讓改變生效"/>
-			<shift-change-direction-tip value="Enter: 找下一個
-Shift+Enter: 找上一個"/>
+			<shift-change-direction-tip value="使用 Shift + Enter 以相反方向進行搜索"/>
         </MiscStrings>
     </Native-Langue>
 </NotepadPlus>
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index 4accf1478..a564878ea 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <NotepadPlus>
-    <Native-Langue name="English" filename="english.xml" version="7.4.2">
+    <Native-Langue name="English" filename="english.xml" version="7.5">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -339,21 +339,18 @@
 
         <Dialog>
             <Find title="" titleFind="Find" titleReplace="Replace" titleFindInFiles="Find in Files" titleMark="Mark">
-                <Item id="1"    name="Find  >>"/>
-                <Item id="1721" name="<<  Find"/>
+                <Item id="1"    name="Find Next"/>
+                <Item id="1722" name="Backward direction"/>
                 <Item id="2"    name="Close"/>
                 <Item id="1620" name="Find what:"/>
                 <Item id="1603" name="Match &amp;whole word only"/>
                 <Item id="1604" name="Match &amp;case"/>
                 <Item id="1605" name="Regular &amp;expression"/>
                 <Item id="1606" name="Wrap aroun&amp;d"/>
-                <Item id="1612" name="&amp;Up"/>
-                <Item id="1613" name="&amp;Down"/>
                 <Item id="1614" name="Count"/>
                 <Item id="1615" name="Find All"/>
                 <Item id="1616" name="Mark line"/>
                 <Item id="1618" name="Purge for each search"/>
-                <Item id="1621" name="Direction"/>
                 <Item id="1611" name="Re&amp;place with:"/>
                 <Item id="1608" name="&amp;Replace"/>
                 <Item id="1609" name="Replace &amp;All"/>
@@ -1002,8 +999,7 @@
 			<word-chars-list-warning-end value="  in your character list."/>
 			<cloud-invalid-warning value="Invalid path."/>
 			<cloud-restart-warning value="Please restart Notepad++ to take effect."/>
-			<shift-change-direction-tip value="Enter: Find Next
-Shift+Enter: Find Previous"/>
+			<shift-change-direction-tip value="Use Shift + Enter to search in the opposite direction"/>
         </MiscStrings>
     </Native-Langue>
 </NotepadPlus>
diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml
index aa6cc182c..b8f896894 100644
--- a/PowerEditor/installer/nativeLang/english_customizable.xml
+++ b/PowerEditor/installer/nativeLang/english_customizable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <NotepadPlus>
-    <Native-Langue name="English" filename="english_customizable.xml" version="7.4.2">
+    <Native-Langue name="English" filename="english_customizable.xml" version="7.5">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -339,21 +339,18 @@
 
         <Dialog>
             <Find title="" titleFind="Find" titleReplace="Replace" titleFindInFiles="Find in Files" titleMark="Mark">
-                <Item id="1"    name="Find  >>"/>
-                <Item id="1721" name="<<  Find"/>
+                <Item id="1"    name="Find Next"/>
+                <Item id="1722" name="Backward direction"/>
                 <Item id="2"    name="Close"/>
                 <Item id="1620" name="Find what:"/>
                 <Item id="1603" name="Match &amp;whole word only"/>
                 <Item id="1604" name="Match &amp;case"/>
                 <Item id="1605" name="Regular &amp;expression"/>
                 <Item id="1606" name="Wrap aroun&amp;d"/>
-                <Item id="1612" name="&amp;Up"/>
-                <Item id="1613" name="&amp;Down"/>
                 <Item id="1614" name="Count"/>
                 <Item id="1615" name="Find All"/>
                 <Item id="1616" name="Mark line"/>
                 <Item id="1618" name="Purge for each search"/>
-                <Item id="1621" name="Direction"/>
                 <Item id="1611" name="Re&amp;place with:"/>
                 <Item id="1608" name="&amp;Replace"/>
                 <Item id="1609" name="Replace &amp;All"/>
@@ -1002,8 +999,7 @@
 			<word-chars-list-warning-end value="  in your character list."/>
 			<cloud-invalid-warning value="Invalid path."/>
 			<cloud-restart-warning value="Please restart Notepad++ to take effect."/>
-			<shift-change-direction-tip value="Enter: Find Next
-Shift+Enter: Find Previous"/>
+			<shift-change-direction-tip value="Use Shift + Enter to search in the opposite direction"/>
         </MiscStrings>
     </Native-Langue>
 </NotepadPlus>
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index 2479579b5..dad4ba028 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <NotepadPlus>
-    <Native-Langue name="Français" filename="french.xml" version="7.4.2">
+    <Native-Langue name="Français" filename="french.xml" version="7.5">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -336,7 +336,7 @@
         <Dialog>
             <Find title="" titleFind="Rechercher" titleReplace="Remplacer" titleFindInFiles="Rechercher dans les fichiers d'un dossier" titleMark="Marquer">
                 <Item id="1" name="Suivant"/>
-				<Item id="1721" name="Précédent"/>
+				<Item id="1722" name="Rechercher vers l'arrière"/>
                 <Item id="1603" name="Mot entier &amp;uniquement"/>
                 <Item id="1604" name="Respecter la &amp;casse"/>
                 <Item id="1605" name="&amp;Expression régulière"/>
@@ -344,14 +344,11 @@
                 <Item id="1608" name="&amp;Remplacer"/>
                 <Item id="1609" name="Remplacer &amp;tout"/>
                 <Item id="1611" name="Rem&amp;placer par :"/>
-                <Item id="1612" name="&amp;Haut"/>
-                <Item id="1613" name="&amp;Bas"/>
                 <Item id="1614" name="Compter"/>
                 <Item id="1615" name="Rechercher tout"/>
                 <Item id="1616" name="Marquer les lignes"/>
                 <Item id="1618" name="Purger à chaque fois"/>
                 <Item id="1620" name="Recherche :"/>
-                <Item id="1621" name="Direction"/>
                 <Item id="1624" name="Mode de recherche"/>
                 <Item id="1625" name="Mode normal"/>
                 <Item id="1626" name="Mode étendu (\n, \r, \t, \0, \x...)"/>
@@ -984,8 +981,7 @@
 			<word-chars-list-warning-end value="  dans la liste des caractères de mot."/>
 			<cloud-invalid-warning value="Chemin invalide."/>
 			<cloud-restart-warning value="Veuillez redémarrer Notepad++ afin que le changement prenne effet."/>
-			<shift-change-direction-tip value="Enter : Suivant
-Shift+Enter : Précédent"/>
+			<shift-change-direction-tip value="Utilisez Shift + Enter pour rechercher dans le sens inverse"/>
         </MiscStrings>
     </Native-Langue>
 </NotepadPlus>
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index aea22c76d..038122fdd 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -2309,7 +2309,6 @@ void FindReplaceDlg::enableMarkAllControls(bool isEnable)
 	::ShowWindow(::GetDlgItem(_hSelf, IDC_IN_SELECTION_CHECK), hideOrShow);
 
 	::ShowWindow(::GetDlgItem(_hSelf, IDC_BACKWARDDIRECTION), !hideOrShow);
-	::ShowWindow(::GetDlgItem(_hSelf, IDC_DIR_STATIC), !hideOrShow);
 }
 
 void FindReplaceDlg::enableFindInFilesControls(bool isEnable)
@@ -2327,8 +2326,6 @@ void FindReplaceDlg::enableFindInFilesControls(bool isEnable)
 	::ShowWindow(::GetDlgItem(_hSelf, IDC_IN_SELECTION_CHECK), isEnable?SW_HIDE:SW_SHOW);
 	::ShowWindow(::GetDlgItem(_hSelf, IDC_CLEAR_ALL), isEnable?SW_HIDE:SW_SHOW);
 	::ShowWindow(::GetDlgItem(_hSelf, IDCMARKALL), isEnable?SW_HIDE:SW_SHOW);
-
-	::ShowWindow(::GetDlgItem(_hSelf, IDC_DIR_STATIC), isEnable?SW_HIDE:SW_SHOW);
 	
 	::ShowWindow(::GetDlgItem(_hSelf, IDREPLACE), isEnable?SW_HIDE:SW_SHOW);
 	::ShowWindow(::GetDlgItem(_hSelf, IDC_REPLACEINSELECTION), isEnable?SW_HIDE:SW_SHOW);
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg_rc.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg_rc.h
index 1e78b6427..3bde24451 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg_rc.h
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg_rc.h
@@ -59,7 +59,7 @@
 #define IDF_PURGE_CHECK	4
 #define	IDC_FINDALL_STATIC				1619
 #define	IDFINDWHAT_STATIC				1620
-#define	IDC_DIR_STATIC					1621
+//#define	IDC_DIR_STATIC					1621
 
 #define	IDC_PERCENTAGE_SLIDER			1622
 #define	IDC_TRANSPARENT_GRPBOX 			1623