From fb7785eeaa3919000834cc503236df481213b078 Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Tue, 30 Jul 2019 20:24:59 +0200
Subject: [PATCH] Disambiguate 5 entries regarding encoding

Remove "Encode" word to avoid the confusion with "Convert".

Close #5951
---
 PowerEditor/installer/nativeLang/chinese.xml | 10 +++++-----
 PowerEditor/installer/nativeLang/english.xml | 10 +++++-----
 PowerEditor/src/Notepad_plus.rc              | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml
index d49e0e877..33763a771 100644
--- a/PowerEditor/installer/nativeLang/chinese.xml
+++ b/PowerEditor/installer/nativeLang/chinese.xml
@@ -265,11 +265,11 @@
                     <Item id="45001" name="轉換成 Windows 格式"/>
                     <Item id="45002" name="轉換成 UNIX 格式"/>
                     <Item id="45003" name="轉換成 Mac 格式"/>
-                    <Item id="45004" name="編譯成 ANSI 碼"/>
-                    <Item id="45005" name="編譯成 UTF-8 碼（BOM 檔首）"/>
-                    <Item id="45006" name="編譯成 UCS-2 Big Endian 碼"/>
-                    <Item id="45007" name="編譯成 UCS-2 Little Endian 碼"/>
-                    <Item id="45008" name="編譯成 UTF-8 碼"/>
+                    <Item id="45004" name="ANSI 碼"/>
+                    <Item id="45005" name="UTF-8 碼（BOM 檔首）"/>
+                    <Item id="45006" name="UCS-2 Big Endian 碼"/>
+                    <Item id="45007" name="UCS-2 Little Endian 碼"/>
+                    <Item id="45008" name="UTF-8 碼"/>
                     <Item id="45009" name="轉換至 ANSI 碼格式"/>
                     <Item id="45010" name="轉換至 UTF-8 碼格式"/>
                     <Item id="45011" name="轉換至 UTF-8 碼格式（BOM 檔首）"/>
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index f9fc4ddb6..fce6f6cf0 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -263,11 +263,11 @@
                     <Item id="45001" name="Windows (CR LF)"/>
                     <Item id="45002" name="Unix (LF)"/>
                     <Item id="45003" name="Macintosh (CR)"/>
-                    <Item id="45004" name="Encode in ANSI"/>
-                    <Item id="45005" name="Encode in UTF-8-BOM"/>
-                    <Item id="45006" name="Encode in UCS-2 BE BOM"/>
-                    <Item id="45007" name="Encode in UCS-2 LE BOM"/>
-                    <Item id="45008" name="Encode in UTF-8"/>
+                    <Item id="45004" name="ANSI"/>
+                    <Item id="45005" name="UTF-8-BOM"/>
+                    <Item id="45006" name="UCS-2 BE BOM"/>
+                    <Item id="45007" name="UCS-2 LE BOM"/>
+                    <Item id="45008" name="UTF-8"/>
                     <Item id="45009" name="Convert to ANSI"/>
                     <Item id="45010" name="Convert to UTF-8"/>
                     <Item id="45011" name="Convert to UTF-8-BOM"/>
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index f194ba1e2..b96c1e860 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -565,11 +565,11 @@ BEGIN
 
     POPUP "E&ncoding"
     BEGIN
-        MENUITEM "Encode in ANSI",                    IDM_FORMAT_ANSI
-        MENUITEM "Encode in UTF-8",                   IDM_FORMAT_AS_UTF_8
-        MENUITEM "Encode in UTF-8-BOM",               IDM_FORMAT_UTF_8
-        MENUITEM "Encode in UCS-2 BE BOM",            IDM_FORMAT_UCS_2BE
-        MENUITEM "Encode in UCS-2 LE BOM",            IDM_FORMAT_UCS_2LE
+        MENUITEM "ANSI",                    IDM_FORMAT_ANSI
+        MENUITEM "UTF-8",                   IDM_FORMAT_AS_UTF_8
+        MENUITEM "UTF-8-BOM",               IDM_FORMAT_UTF_8
+        MENUITEM "UCS-2 BE BOM",            IDM_FORMAT_UCS_2BE
+        MENUITEM "UCS-2 LE BOM",            IDM_FORMAT_UCS_2LE
         POPUP "Character sets"
         BEGIN
             POPUP "Arabic"