From 953919c4067c6ccbc3003adaad90074d621b0580 Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Wed, 26 Dec 2018 00:06:04 +0100
Subject: [PATCH] Make new added SHA-256 hash features translatable

---
 PowerEditor/installer/nativeLang/chinese.xml | 20 ++++++++++++++--
 PowerEditor/installer/nativeLang/english.xml | 18 ++++++++++++++-
 PowerEditor/installer/nativeLang/french.xml  | 24 ++++++++++++++++----
 PowerEditor/src/Notepad_plus.cpp             | 12 +++++++++-
 PowerEditor/src/NppCommands.cpp              |  2 +-
 PowerEditor/src/localization.cpp             |  1 +
 6 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml
index 28f7b56d..7167aca6 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.5.8">
+    <Native-Langue name="繁體中文/正體中文" filename="chinese.xml" version="7.6.2">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -64,6 +64,7 @@
                     <Item subMenuId="encoding-vietnamese" name="越南文"/>
                     <Item subMenuId="settings-import"  name="匯入"/>
                     <Item subMenuId="tools-md5"  name="MD5"/>
+					<Item subMenuId="tools-sha256"  name="SHA-256"/>
                 </SubEntries>
 
                 <!-- All Menu Items -->
@@ -300,7 +301,10 @@
                     <Item id="48015" name="外掛模組管理..."/>
                     <Item id="48501" name="產生 MD5..."/>
                     <Item id="48502" name="從檔案產生 MD5..."/>
-                    <Item id="48503" name="直接產生並複製 MD5"/>
+                    <Item id="48503" name="直接從選取產生 MD5 並複製到剪貼簿"/>
+                    <Item id="48504" name="產生 SHA-256..."/>
+                    <Item id="48505" name="從檔案產生 SHA-256..."/>
+                    <Item id="48506" name="直接從選取產生 SHA-256 並複製到剪貼板"/>
                     <Item id="49000" name="執行(&amp;R)..."/>
                     <Item id="50000" name="函數自動完成"/>
                     <Item id="50001" name="字詞自動完成"/>
@@ -419,6 +423,18 @@
                 <Item id="2"    name="關閉"/>
             </MD5FromTextDlg>
 
+            <SHA256FromFilesDlg title="從檔案產生 SHA-256">
+                <Item id="1922" name="從檔案產生 SHA-256..."/>
+                <Item id="1924" name="複製到剪貼簿"/>
+                <Item id="2"    name="關閉"/>
+            </SHA256FromFilesDlg>
+
+            <SHA256FromTextDlg title="產生 SHA-256">
+                <Item id="1932" name="將每一行視為獨立的字串"/>
+                <Item id="1934" name="複製到剪貼簿"/>
+                <Item id="2"    name="關閉"/>
+            </SHA256FromTextDlg>
+			
             <PluginsAdminDlg title="外掛模組管理" titleAvailable = "可安裝" titleUpdates = "更新" titleInstalled = "已安裝">
                 <ColumnPlugin   name="外掛模組"/>
                 <ColumnVersion  name="版本"/>
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index 810488e2..6278792a 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.5.5">
+    <Native-Langue name="English" filename="english.xml" version="7.6.2">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -64,6 +64,7 @@
                     <Item subMenuId="encoding-vietnamese" name="Vietnamese"/>
                     <Item subMenuId="settings-import"  name="Import"/>
                     <Item subMenuId="tools-md5"  name="MD5"/>
+                    <Item subMenuId="tools-sha256"  name="SHA-256"/>
                 </SubEntries>
 
                 <!-- all menu item -->
@@ -298,6 +299,9 @@
                     <Item id="48501" name="Generate..."/>
                     <Item id="48502" name="Generate from files..."/>
                     <Item id="48503" name="Generate from selection into clipboard"/>
+                    <Item id="48504" name="Generate..."/>
+                    <Item id="48505" name="Generate from files..."/>
+                    <Item id="48506" name="Generate from selection into clipboard"/>
                     <Item id="49000" name="&amp;Run..."/>
 
                     <Item id="50000" name="Function Completion"/>
@@ -417,7 +421,19 @@
                 <Item id="1934" name="Copy to Clipboard"/>
                 <Item id="2"    name="Close"/>
             </MD5FromTextDlg>
+			
+            <SHA256FromFilesDlg title="Generate SHA-256 digest from files">
+                <Item id="1922" name="Choose files to generate SHA-256..."/>
+                <Item id="1924" name="Copy to Clipboard"/>
+                <Item id="2"    name="Close"/>
+            </SHA256FromFilesDlg>
 
+            <SHA256FromTextDlg title="Generate SHA-256 digest">
+                <Item id="1932" name="Treat each line as a separate string"/>
+                <Item id="1934" name="Copy to Clipboard"/>
+                <Item id="2"    name="Close"/>
+            </SHA256FromTextDlg>
+			
             <PluginsAdminDlg title="Plugins Admin" titleAvailable = "Available" titleUpdates = "Updates" titleInstalled = "Installed">
                 <ColumnPlugin   name="Plugin"/>
                 <ColumnVersion  name="Version"/>
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index 57cc3773..2dc60173 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.5.5">
+    <Native-Langue name="Français" filename="french.xml" version="7.6.2">
         <Menu>
             <Main>
                 <!-- Main Menu Entries -->
@@ -64,6 +64,7 @@
                     <Item subMenuId="encoding-vietnamese" name="Vietnamien"/>
                     <Item subMenuId="settings-import"  name="Importer"/>
                     <Item subMenuId="tools-md5"  name="MD5"/>
+					<Item subMenuId="tools-sha256"  name="SHA-256"/>
                 </SubEntries>
 
                 <!-- all menu item -->
@@ -298,7 +299,10 @@
                     <Item id="48015" name="Gestionnaire des modules d'extension..."/>
                     <Item id="48501" name="Générer..."/>
                     <Item id="48502" name="Générer depuis les fichiers..."/>
-                    <Item id="48503" name="Générer dans le presse-papiers"/>
+                    <Item id="48503" name="Générer dans le presse-papiers depuis la selection"/>
+                    <Item id="48501" name="Générer..."/>
+                    <Item id="48502" name="Générer depuis les fichiers..."/>
+                    <Item id="48503" name="Générer dans le presse-papiers depuis la selection"/>
                     <Item id="48016" name="Modifier/Supprimer une macro..."/>
                     <Item id="48017" name="Modifier/Supprimer une commande..."/>
                     <Item id="48018" name="Éditer le menu contextuel"/>
@@ -402,18 +406,30 @@
                 <Item id="2" name="Annuler"/>
             </Run>
             
-            <MD5FromFilesDlg title="Calculer les empreintes MD5 depuis les fichiers">
+            <MD5FromFilesDlg title="Calculer les empreintes de MD5 depuis les fichiers">
                 <Item id="1922" name="Choisir les fichiers pour générer les empreintes..."/>
                 <Item id="1924" name="Copier dans le presse-papiers"/>
                 <Item id="2"    name="Fermer"/>
             </MD5FromFilesDlg>
 
-            <MD5FromTextDlg title="Calculer l'empreinte MD5">
+            <MD5FromTextDlg title="Calculer l'empreinte de MD5">
                 <Item id="1932" name="Traiter chaque ligne comme une chaine de caractères"/>
                 <Item id="1934" name="Copier dans le presse-papiers"/>
                 <Item id="2"    name="Fermer"/>
             </MD5FromTextDlg>
 
+            <SHA256FromFilesDlg title="Calculer les empreintes de SHA-256 depuis les fichiers">
+                <Item id="1922" name="Choisir les fichiers pour générer les empreintes..."/>
+                <Item id="1924" name="Copier dans le presse-papiers"/>
+                <Item id="2"    name="Fermer"/>
+            </SHA256FromFilesDlg>
+
+            <SHA256FromTextDlg title="Calculer l'empreinte de SHA-256">
+                <Item id="1932" name="Traiter chaque ligne comme une chaine de caractères"/>
+                <Item id="1934" name="Copier dans le presse-papiers"/>
+                <Item id="2"    name="Fermer"/>
+            </SHA256FromTextDlg>
+
             <PluginsAdminDlg title="Gestionnaire des modules d'extension" titleAvailable = "Disponibles" titleUpdates = "Mises à jour" titleInstalled = "Installés">
                 <ColumnPlugin   name="Modules d'extension"/>
                 <ColumnVersion  name="Version"/>
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index f589671e..5a3745c0 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -5695,7 +5695,7 @@ bool Notepad_plus::reloadLang()
 
 	if (_md5FromFilesDlg.isCreated())
 	{
-		_nativeLangSpeaker.changeDlgLang(_md5FromFilesDlg.getHSelf(), "HashFromFilesDlg");
+		_nativeLangSpeaker.changeDlgLang(_md5FromFilesDlg.getHSelf(), "MD5FromFilesDlg");
 	}
 
 	if (_md5FromTextDlg.isCreated())
@@ -5703,6 +5703,16 @@ bool Notepad_plus::reloadLang()
 		_nativeLangSpeaker.changeDlgLang(_md5FromTextDlg.getHSelf(), "MD5FromTextDlg");
 	}
 
+	if (_sha2FromFilesDlg.isCreated())
+	{
+		_nativeLangSpeaker.changeDlgLang(_sha2FromFilesDlg.getHSelf(), "SHA256FromFilesDlg");
+	}
+
+	if (_sha2FromTextDlg.isCreated())
+	{
+		_nativeLangSpeaker.changeDlgLang(_sha2FromTextDlg.getHSelf(), "SHA256FromTextDlg");
+	}
+
 	if (_runMacroDlg.isCreated())
 	{
 		_nativeLangSpeaker.changeDlgLang(_runMacroDlg.getHSelf(), "MultiMacro");
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index b5e79554..81cbfb97 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -2572,7 +2572,7 @@ void Notepad_plus::command(int id)
 			bool isFirstTime = !_md5FromFilesDlg.isCreated();
 			_md5FromFilesDlg.doDialog(_nativeLangSpeaker.isRTL());
 			if (isFirstTime)
-				_nativeLangSpeaker.changeDlgLang(_md5FromFilesDlg.getHSelf(), "HashFromFilesDlg");
+				_nativeLangSpeaker.changeDlgLang(_md5FromFilesDlg.getHSelf(), "MD5FromFilesDlg");
 		}
 		break;
 
diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp
index 59c54264..fa7fd908 100644
--- a/PowerEditor/src/localization.cpp
+++ b/PowerEditor/src/localization.cpp
@@ -100,6 +100,7 @@ MenuPosition menuPos[] = {
 	{ 6,  4, -1, "settings-import" },
 
 	{ 7,  0, -1, "tools-md5" },
+	{ 7,  1, -1, "tools-sha256" },
 	{ -1, -1, -1, "" } // End of array
 };