diff --git a/Build/Changes.txt b/Build/Changes.txt
index 087c2ffee..29894caa8 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package
 
 
 =====================================================
-Current BETA Version 5.20.826.(build_#) (2020-08-26)
+Current BETA Version 5.20.828.(build_#) (2020-08-28)
 =====================================================
 
 -----------------------------------------------------
@@ -64,6 +64,7 @@ NEW:
 CHANGES:
 -----------------------------------------------------
 [.###.#]- 
+[.828.1]- Rearange and review "File Encoding" menu to clarify behavior.
 [.826.1]- Default for file-encoding-tag parsing -> OFF.
 [.826.1]- Swap file-encoding-tag parsing priority (encoding <-> coding).
 [.825.1]- Revert Initial Font-Size based on DeviceCaps.
diff --git a/Versions/day.txt b/Versions/day.txt
index a05e0eedc..9babd2833 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-826
+828
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index a308c8ca7..7d0d4c6b7 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Nuwe\tCtrl+N",                                   IDM_FILE_NEW
         MENUITEM "Maak &Oop...\tCtrl+O",                            IDM_FILE_OPEN
-        MENUITEM "Ke&er Terug\tF5",                                 IDM_FILE_REVERT
         MENUITEM "S&toor\tCtrl+S",                                  IDM_FILE_SAVE
         MENUITEM "Stoor &As...\tF6",                                IDM_FILE_SAVEAS
         MENUITEM "Stoor &Kopie...\tCtrl+F6",                        IDM_FILE_SAVECOPY
@@ -72,8 +71,8 @@ BEGIN
         POPUP "Pad na &knipbord"
         BEGIN
             MENUITEM "Slegs Kopieer &Lêernaam\tCtrl+F9",        IDM_EDIT_INSERT_FILENAME
-            MENUITEM "Slegs Kopieër &Gids-pad",           IDM_EDIT_INSERT_DIRNAME
-            MENUITEM "Kopieer &Volledige Pad\tCtrl+Shift+F9",      IDM_EDIT_INSERT_PATHNAME
+            MENUITEM "Slegs Kopieër &Gids-pad",                 IDM_EDIT_INSERT_DIRNAME
+            MENUITEM "Kopieer &Volledige Pad\tCtrl+Shift+F9",   IDM_EDIT_INSERT_PATHNAME
         END
         POPUP "&Begin"
         BEGIN
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Maak &File Explorer Oop",             IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                   IDM_FILE_REVERT
         POPUP "&Enkodering"
         BEGIN
-            MENUITEM "&ANSI",                               IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                            IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                 IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                    IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 with &Signature",               IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Meer...\tF9",                        IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",              CMD_RECODEDEFAULT
+                MENUITEM "A&NSI\tCtrl+Shift+A",             CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",              CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",        CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII as UT&F-8\tCtrl+Shift+F8",  CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",        CMD_RELOADFORCEDETECTION
+                MENUITEM "&Ignoreer Kodering Tags\tAlt+F8", CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",          IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                           IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                        IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",             IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",                IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 with &Signature",           IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Hercodeer na &Standaard",                CMD_RECODEDEFAULT
-            MENUITEM "Hercodeer na A&NSI\tCtrl+Shift+A",       CMD_RECODEANSI
-            MENUITEM "Hercodeer na &OEM\tCtrl+Shift+O",        CMD_RECODEOEM
-            MENUITEM "Hercodeer na &GB18030\tCtrl+Shift+F10",  CMD_RECODEGB18030
-            MENUITEM "Hercodeer na U&CHARDET-analise",         CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII as UT&F-8\tCtrl+Shift+F8",      CMD_RELOADASCIIASUTF8
-            MENUITEM "&Ignoreer Kodering Tags\tAlt+F8",     CMD_RELOADNOFILEVARS
-            MENUITEM "&Herkodeer...\tF8",                   IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Stel S&tandaard...",                  IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "L&yn Einde"
         BEGIN
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index c62e89a03..a288de2ce 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Новы\tCtrl+N",                                   IDM_FILE_NEW
         MENUITEM "&Адкрыць...\tCtrl+O",                             IDM_FILE_OPEN
-        MENUITEM "Адкаці&ць змяненні\tF5",                          IDM_FILE_REVERT
         MENUITEM "За&хаваць\tCtrl+S",                               IDM_FILE_SAVE
         MENUITEM "Захаваць &як...\tF6",                             IDM_FILE_SAVEAS
         MENUITEM "Захаваць копі&ю...\tCtrl+F6",                     IDM_FILE_SAVECOPY
@@ -77,7 +76,7 @@ BEGIN
         END
         POPUP "&Запусціць"
         BEGIN
-            MENUITEM "&Шукаць у файлах\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Шукаць у файлах\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "Копі&ю акна\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Пустое акно\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Адкрыць Права&днік",                 IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "Кадо&ўка"
         BEGIN
-            MENUITEM "&ANSI",                              IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                           IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                   IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 з BO&M",                       IDM_ENCODING_UTF8SIGN
-            MENUITEM "Я&шчэ...\tF9",                       IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",                  CMD_RECODEDEFAULT
+                MENUITEM "A&NSI\tCtrl+Shift+A",                 CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",                  CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",            CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "Пераадкрыць у ASCII я&к UTF-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",                     CMD_RELOADFORCEDETECTION
+                MENUITEM "Ігнараваць &тэгі кадоўкі\tAlt+F8",             CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",             IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                              IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                           IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",                IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",                   IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 з BO&M",                       IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",             IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Пераадкрыць у прадвызначанай ка&доўцы",             CMD_RECODEDEFAULT
-            MENUITEM "Пераадкрыць у A&NSI\tCtrl+Shift+A",                 CMD_RECODEANSI
-            MENUITEM "Пераадкрыць у &OEM\tCtrl+Shift+O",                  CMD_RECODEOEM
-            MENUITEM "Пераадкрыць у &GB18030\tCtrl+Shift+F10",            CMD_RECODEGB18030
-            MENUITEM "Пераадкрыць з UCHARDET &аналізам",                  CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "Пераадкрыць у ASCII я&к UTF-8\tCtrl+Shift+F8",      CMD_RELOADASCIIASUTF8
-            MENUITEM "Ігнараваць &тэгі кадоўкі\tAlt+F8",                  CMD_RELOADNOFILEVARS
-            MENUITEM "&Пераадкрыць у...\tF8",                             IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Прадв&ызначыць кадоўку...",   IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",              IDM_ENCODING_SETDEFAULT
         END
         POPUP "Кан&чаткі радкоў"
         BEGIN
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 59f8a016b..486db6858 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -120,7 +120,7 @@ BEGIN
                 MENUITEM "&Más Codificaciones...\tF9",      IDM_ENCODING_SELECT
             END
             MENUITEM SEPARATOR
-            MENUITEM "Establecer Codificación &Defecto...", IDM_ENCODING_SETDEFAULT
+            MENUITEM "Establecer la Codificación por &Defecto...", IDM_ENCODING_SETDEFAULT
         END
         POPUP "&Finales de línea"
         BEGIN
diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc
index 2e347c4de..65a19c6b3 100644
--- a/language/np3_es_mx/menu_es_mx.rc
+++ b/language/np3_es_mx/menu_es_mx.rc
@@ -120,7 +120,7 @@ BEGIN
                 MENUITEM "&Más Codificaciones...\tF9",      IDM_ENCODING_SELECT
             END
             MENUITEM SEPARATOR
-            MENUITEM "Establecer Codificación &Defecto...", IDM_ENCODING_SETDEFAULT
+            MENUITEM "Establecer la Codificación por &Defecto...", IDM_ENCODING_SETDEFAULT
         END
         POPUP "&Finales de línea"
         BEGIN
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 4553feafd..0d2369e3f 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -117,7 +117,7 @@ BEGIN
                 MENUITEM "UTF-&8\tShift+F8",                         IDM_ENCODING_UTF8
                 MENUITEM "UTF-8 avec &Signature",                    IDM_ENCODING_UTF8SIGN
                 MENUITEM SEPARATOR
-            MENUITEM "&Plus d'Encodages...\tF9",                     IDM_ENCODING_SELECT
+                MENUITEM "&Plus d'Encodages...\tF9",                 IDM_ENCODING_SELECT
             END
             MENUITEM SEPARATOR
             MENUITEM "Définir l'Encodage par &Défaut...",            IDM_ENCODING_SETDEFAULT
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 2e50040ab..1cad33c02 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Új\tCtrl+N",                                        IDM_FILE_NEW
         MENUITEM "Me&gnyitás...\tCtrl+O",                              IDM_FILE_OPEN
-        MENUITEM "&Visszaállás\tF5",                                   IDM_FILE_REVERT
         MENUITEM "&Mentés\tCtrl+S",                                    IDM_FILE_SAVE
         MENUITEM "Mentés m&ásként...\tF6",                             IDM_FILE_SAVEAS
         MENUITEM "Másolat m&entése...\tCtrl+F6",                       IDM_FILE_SAVECOPY
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Fájl&böngésző megnyitása",           IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "&Kódolás"
         BEGIN
-            MENUITEM "&ANSI",                              IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                           IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                   IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 with &Signature",              IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Továbbiak...\tF9",                  IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",                 CMD_RECODEDEFAULT
+                MENUITEM "A&NSI-ra\tCtrl+Shift+A",             CMD_RECODEANSI
+                MENUITEM "&OEM-re\tCtrl+Shift+O",              CMD_RECODEOEM
+                MENUITEM "&GB18030-ra\tCtrl+Shift+F10",        CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII-t UTF-8-k&ént\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",           CMD_RELOADFORCEDETECTION
+                MENUITEM "Kódolási elemek ki&hagyása\tAlt+F8", CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",             IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                          IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                       IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",            IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",               IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 with &Signature",          IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Újrakódolás az ala&pért.-re",             CMD_RECODEDEFAULT
-            MENUITEM "Újrakódolás A&NSI-ra\tCtrl+Shift+A",      CMD_RECODEANSI
-            MENUITEM "Újrakódolás &OEM-re\tCtrl+Shift+O",       CMD_RECODEOEM
-            MENUITEM "Újrakódolás &GB18030-ra\tCtrl+Shift+F10", CMD_RECODEGB18030
-            MENUITEM "Újrakódolás UCHARDET elemzéshez",         CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII-t UTF-8-k&ént\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
-            MENUITEM "Kódolási elemek ki&hagyása\tAlt+F8", CMD_RELOADNOFILEVARS
-            MENUITEM "&Újrakódolás...\tF8",                IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Alapértelmezett &beállítása...",     IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "Sorvé&gek"
         BEGIN
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 1fa1d4cd2..acf68a4b6 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -59,21 +59,20 @@ BEGIN
     BEGIN
         MENUITEM "&Nuovo\tCtrl+N",                                  IDM_FILE_NEW
         MENUITEM "&Apri...\tCtrl+O",                                IDM_FILE_OPEN
-        MENUITEM "Ripris&tina\tF5",                                 IDM_FILE_REVERT
         MENUITEM "&Salva\tCtrl+S",                                  IDM_FILE_SAVE
         MENUITEM "Salva con nome...\tF6",                           IDM_FILE_SAVEAS
         MENUITEM "Salva &copia...\tCtrl+F6",                        IDM_FILE_SAVECOPY
         MENUITEM "Salva con &Data/Ora originali del file\tCtrl+Alt+F6", IDM_FILE_PRESERVE_FILEMODTIME
         MENUITEM SEPARATOR
-        MENUITEM "Sola lettu&ra",                         IDM_FILE_READONLY
+        MENUITEM "Sola lettu&ra",                          IDM_FILE_READONLY
         MENUITEM SEPARATOR
         MENUITEM "Imposta passphrase per crittografia...", IDM_SETPASS
         MENUITEM SEPARATOR
         POPUP "Percorso negli Appunti"
         BEGIN
-            MENUITEM "Copia &Nome file\tCtrl+F9",       IDM_EDIT_INSERT_FILENAME
-            MENUITEM "Copia solo &Percorso",          IDM_EDIT_INSERT_DIRNAME
-            MENUITEM "Copia il &Full-path\tCtrl+Shift+F9",     IDM_EDIT_INSERT_PATHNAME
+            MENUITEM "Copia &Nome file\tCtrl+F9",          IDM_EDIT_INSERT_FILENAME
+            MENUITEM "Copia solo &Percorso",               IDM_EDIT_INSERT_DIRNAME
+            MENUITEM "Copia il &Full-path\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME
         END
         POPUP "&Esegui"
         BEGIN
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Apri &Esplora File",                IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                 IDM_FILE_REVERT
         POPUP "&Encoding"
         BEGIN
-            MENUITEM "&ANSI",                             IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                          IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",               IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                  IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 with &Signature",             IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Altri...\tF9",                     IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",               CMD_RECODEDEFAULT
+                MENUITEM "&ANSI\tCtrl+Shift+A",              CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",               CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",         CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII come UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",         CMD_RELOADFORCEDETECTION
+                MENUITEM "Ignora Encoding &Tags\tAlt+F8",    CMD_RELOADNOFILEVARS
             MENUITEM SEPARATOR
-            MENUITEM "Ricodifica con Encoding di &Default",             CMD_RECODEDEFAULT
-            MENUITEM "Ricodifica come &ANSI\tCtrl+Shift+A",             CMD_RECODEANSI
-            MENUITEM "Ricodifica come &OEM\tCtrl+Shift+O",              CMD_RECODEOEM
-            MENUITEM "Ricodifica come &GB18030\tCtrl+Shift+F10",        CMD_RECODEGB18030
-            MENUITEM "Ricodifica a UCHARDET Analysis",                  CMD_RELOADFORCEDETECTION
+                MENUITEM "&More Encodings...\tF8",           IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                          IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                       IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",            IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",               IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 with &Signature",          IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "ASCII come UTF-&8\tCtrl+Shift+F8",                CMD_RELOADASCIIASUTF8
-            MENUITEM "Ignora Encoding &Tags\tAlt+F8",                   CMD_RELOADNOFILEVARS
-            MENUITEM "&Ricodifica...\tF8",                IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Imposta &Default...",               IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "Terminatori di ri&ga"
         BEGIN
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 6756c8f2c..ba18340f1 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "新規(&N)\tCtrl+N",                                IDM_FILE_NEW
         MENUITEM "開く(&O)...\tCtrl+O",                              IDM_FILE_OPEN
-        MENUITEM "再読み込み(&V)\tF5",                               IDM_FILE_REVERT
         MENUITEM "上書き保存(&S)\tCtrl+S",                           IDM_FILE_SAVE
         MENUITEM "名前を付けて保存(&A)...\tF6",                        IDM_FILE_SAVEAS
         MENUITEM "コピーして保存(&C)...\tCtrl+F6",                      IDM_FILE_SAVECOPY
@@ -77,12 +76,12 @@ BEGIN
         END
         POPUP "起動(&L)"
         BEGIN
-            MENUITEM "ファイル群から検索(&S)\tCtrl+Shift+F",             IDM_GREP_WIN_SEARCH
+            MENUITEM "ファイル群から検索(&S)\tCtrl+Shift+F",      IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
-            MENUITEM "同じファイルを開く(&N)\tAlt+N",             IDM_FILE_NEWWINDOW
+            MENUITEM "同じファイルを開く(&N)\tAlt+N",               IDM_FILE_NEWWINDOW
             MENUITEM "新規ウィンドウ(&E)\tAlt+Shift+N",           IDM_FILE_NEWWINDOW2
             MENUITEM SEPARATOR
-            MENUITEM "管理者権限で再起動(&R)",                    IDM_FILE_LAUNCH_ELEVATED
+            MENUITEM "管理者権限で再起動(&R)",                  IDM_FILE_LAUNCH_ELEVATED
             MENUITEM SEPARATOR
             MENUITEM "開いている文書を実行(&D)\tCtrl+L",          IDM_FILE_LAUNCH
             MENUITEM "別のプログラムで開く(&O)...\tAlt+L",         IDM_FILE_OPENWITH
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "エクスプローラーを開く(&F)",                    IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Revert from File(&V)\tF5",                  IDM_FILE_REVERT
         POPUP "文字コード(&E)"
         BEGIN
-            MENUITEM "ANSI (&A)",                             IDM_ENCODING_ANSI
-            MENUITEM "Unicode (&U)",                          IDM_ENCODING_UNICODE
-            MENUITEM "Unicode BE (&B)",                       IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-8 (&8) \tShift+F8",                 IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 BOM (&S)",                        IDM_ENCODING_UTF8SIGN
-            MENUITEM "ほかの文字コード指定(&M)...\tF9",           IDM_ENCODING_SELECT
+            POPUP "Revert from File as(&R)"
+            BEGIN
+                MENUITEM "Default (Setting) (&D)",          CMD_RECODEDEFAULT
+                MENUITEM "ANSI (&N)\tCtrl+Shift+A",         CMD_RECODEANSI
+                MENUITEM "OEM (&O)\tCtrl+Shift+O",          CMD_RECODEOEM
+                MENUITEM "GB18030 (&G)\tCtrl+Shift+F10",    CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII を UTF-8として開く(&F)\tCtrl+Shift+F8",  CMD_RELOADASCIIASUTF8
+                MENUITEM "Force UCHARDET Analysis(&C)",              CMD_RELOADFORCEDETECTION
+                MENUITEM "文字コードを無視(&I)\tAlt+F8",                 CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF8",             IDM_ENCODING_RECODE
+            END
+            POPUP "Set Document as(&S)"
+            BEGIN
+                MENUITEM "ANSI (&A)",                             IDM_ENCODING_ANSI
+                MENUITEM "Unicode (&U)",                          IDM_ENCODING_UNICODE
+                MENUITEM "Unicode BE (&B)",                       IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-8 (&8) \tShift+F8",                 IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 BOM (&S)",                        IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF9",            IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "デフォルトで読み直し(&D)",                   CMD_RECODEDEFAULT
-            MENUITEM "ANSI で読み直し(&N)\tCtrl+Shift+A",         CMD_RECODEANSI
-            MENUITEM "OEM で読み直し(&O)\tCtrl+Shift+O",          CMD_RECODEOEM
-            MENUITEM "GB18030 で読み直し(&G)\tCtrl+Shift+F10",    CMD_RECODEGB18030
-            MENUITEM "UCHARDET 解析で検出し読み直し(&C)",          CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII を UTF-8として開く(&F)\tCtrl+Shift+F8",  CMD_RELOADASCIIASUTF8
-            MENUITEM "文字コードを無視(&I)\tAlt+F8",               CMD_RELOADNOFILEVARS
-            MENUITEM "文字コードを指定して読み直し(&R)...\tF8",      IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "デフォルトを設定(&T)...",                    IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding Defaults(&D)...",             IDM_ENCODING_SETDEFAULT
         END
         POPUP "改行コード(&G)"
         BEGIN
@@ -121,7 +128,7 @@ BEGIN
             MENUITEM "Mac(&M) (CR)",                         IDM_LINEENDINGS_CR
             MENUITEM "Unix(&U) (LF)",                        IDM_LINEENDINGS_LF
             MENUITEM SEPARATOR
-            MENUITEM "デフォルトを設定(&D)...",               IDM_LINEENDINGS_SETDEFAULT
+            MENUITEM "デフォルトを設定(&D)...",                 IDM_LINEENDINGS_SETDEFAULT
         END
         MENUITEM SEPARATOR
         MENUITEM "インデントの検査(&I)...",                      CMD_CHECK_INDENTATION
@@ -130,7 +137,7 @@ BEGIN
         MENUITEM "印刷(&P)...\tCtrl+P",                       IDM_FILE_PRINT
         MENUITEM SEPARATOR
         MENUITEM "プロパティ(&T)...",                            IDM_FILE_PROPERTIES
-        MENUITEM "デスクトップにショートカット(&K)",               IDM_FILE_CREATELINK
+        MENUITEM "デスクトップにショートカット(&K)",                  IDM_FILE_CREATELINK
         MENUITEM SEPARATOR
         MENUITEM "ファイラで開く(&B)...\tCtrl+M",               IDM_FILE_BROWSE
         POPUP "お気に入り(&F)"
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 6b05defe3..138fc0182 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "새 파일(&N)\tCtrl+N",                        IDM_FILE_NEW
         MENUITEM "열기(&O)...\tCtrl+O",                        IDM_FILE_OPEN
-        MENUITEM "새로 고침(&V)\tF5",                          IDM_FILE_REVERT
         MENUITEM "저장(&S)\tCtrl+S",                           IDM_FILE_SAVE
         MENUITEM "다른 이름으로 저장(&A)...\tF6",               IDM_FILE_SAVEAS
         MENUITEM "복사본 저장(&C)...\tCtrl+F6",                 IDM_FILE_SAVECOPY
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "탐색기 열기(&F)",                       IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Revert from File(&V)\tF5",                  IDM_FILE_REVERT
         POPUP "인코딩(&E)"
         BEGIN
-            MENUITEM "&ANSI",                               IDM_ENCODING_ANSI
-            MENUITEM "유니코드(&U)",                         IDM_ENCODING_UNICODE
-            MENUITEM "유니코드 &Big Endian",                 IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                    IDM_ENCODING_UTF8
-            MENUITEM "서명 있는 UTF-8(&S)",                  IDM_ENCODING_UTF8SIGN
-            MENUITEM "기타(&M)...\tF9",                      IDM_ENCODING_SELECT
+            POPUP "Revert from File as(&R)"
+            BEGIN
+                MENUITEM "Default (Setting) (&D)",             CMD_RECODEDEFAULT
+                MENUITEM "ANSI (&N)\tCtrl+Shift+A",            CMD_RECODEANSI
+                MENUITEM "OEM (&O)\tCtrl+Shift+O",             CMD_RECODEOEM
+                MENUITEM "GB18030 (&G)\tCtrl+Shift+F10",       CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII를 UTF-8로 (&F)\tCtrl+Shift+F8",  CMD_RELOADASCIIASUTF8
+                MENUITEM "Force UCHARDET Analysis(&C)",          CMD_RELOADFORCEDETECTION
+                MENUITEM "인코딩 태그 무시(&I)\tAlt+F8",          CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "Set Document as(&S)"
+            BEGIN
+                MENUITEM "&ANSI",                            IDM_ENCODING_ANSI
+                MENUITEM "유니코드(&U)",                      IDM_ENCODING_UNICODE
+                MENUITEM "유니코드 &Big Endian",              IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",                 IDM_ENCODING_UTF8
+                MENUITEM "서명 있는 UTF-8(&S)",               IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "기본값으로 표시(&D)",                   CMD_RECODEDEFAULT
-            MENUITEM "ANSI로 표시(&N)\tCtrl+Shift+A",         CMD_RECODEANSI
-            MENUITEM "OEM으로 표시(&O)\tCtrl+Shift+O",        CMD_RECODEOEM
-            MENUITEM "GB18030으로 표시(&G)\tCtrl+Shift+F10",  CMD_RECODEGB18030
-            MENUITEM "UCHARDET 분석으로 재 코딩(&C)",         CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII를 UTF-8로 (&F)\tCtrl+Shift+F8",  CMD_RELOADASCIIASUTF8
-            MENUITEM "인코딩 태그 무시(&I)\tAlt+F8",          CMD_RELOADNOFILEVARS
-            MENUITEM "문자 집합(&R)...\tF8",                 IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "기본값 설정(&T)...",                   IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding Defaults(&D)...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "줄 끝(&G)"
         BEGIN
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 422f91e4c..9adde69ae 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -120,7 +120,7 @@ BEGIN
                 MENUITEM "&Meer Encoding...\tF9",                 IDM_ENCODING_SELECT
             END
             MENUITEM SEPARATOR
-            MENUITEM "Instellen Encoding &Standaard...",           IDM_ENCODING_SETDEFAULT
+            MENUITEM "Instellen de &Standaard Encoding...",       IDM_ENCODING_SETDEFAULT
         END
         POPUP "Lijn e&indes"
         BEGIN
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 295c3034c..b524a1173 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Nowy\tCtrl+N",                                   IDM_FILE_NEW
         MENUITEM "&Otwórz...\tCtrl+O",                              IDM_FILE_OPEN
-        MENUITEM "Przywróć\tF5",                                    IDM_FILE_REVERT
         MENUITEM "&Zapisz\tCtrl+S",                                 IDM_FILE_SAVE
         MENUITEM "Zapisz &jako...\tF6",                             IDM_FILE_SAVEAS
         MENUITEM "Zapisz &kopię...\tCtrl+F6",                       IDM_FILE_SAVECOPY
@@ -72,12 +71,12 @@ BEGIN
         POPUP "Ścieżka do Schowka"
         BEGIN
             MENUITEM "Kopiuj tylko nazwę pliku\tCtrl+F9",       IDM_EDIT_INSERT_FILENAME
-            MENUITEM "Kopiuj tylko ścieżkę katalogu",          IDM_EDIT_INSERT_DIRNAME
+            MENUITEM "Kopiuj tylko ścieżkę katalogu",           IDM_EDIT_INSERT_DIRNAME
             MENUITEM "Kopiuj pełną ścieżkę\tCtrl+Shift+F9",     IDM_EDIT_INSERT_PATHNAME
         END
         POPUP "&Uruchom"
         BEGIN
-            MENUITEM "&Szukaj w plikach\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Szukaj w plikach\tCtrl+Shift+F",         IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nowe okno\tAlt+N",                  IDM_FILE_NEWWINDOW
             MENUITEM "&Puste okno\tAlt+Shift+N",           IDM_FILE_NEWWINDOW2
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Otwórz Eksplorator pliku",           IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "&Kodowanie"
         BEGIN
-            MENUITEM "&ANSI",                               IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                            IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                 IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                    IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 z &sygnaturą",                  IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Więcej...\tF9",                      IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",             CMD_RECODEDEFAULT
+                MENUITEM "&ANSI\tCtrl+Shift+A",            CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",             CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",       CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII jako UTF-&8\tCtrl+Shift+F8",      CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",              CMD_RELOADFORCEDETECTION
+                MENUITEM "Ignoruj znaczniki &kodowania\tAlt+F8",  CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                          IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                       IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",            IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",               IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 z &sygnaturą",             IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Przekoduj na domyślny",                      CMD_RECODEDEFAULT
-            MENUITEM "Przekoduj na &ANSI\tCtrl+Shift+A",           CMD_RECODEANSI
-            MENUITEM "Przekoduj na &OEM\tCtrl+Shift+O",            CMD_RECODEOEM
-            MENUITEM "Przekoduj na &GB18030\tCtrl+Shift+F10",      CMD_RECODEGB18030
-            MENUITEM "Przekoduj na analizę UCHARDET",              CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII jako UTF-&8\tCtrl+Shift+F8",           CMD_RELOADASCIIASUTF8
-            MENUITEM "Ignoruj znaczniki &kodowania\tAlt+F8",       CMD_RELOADNOFILEVARS
-            MENUITEM "&Przekoduj...\tF8",                          IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Ustaw &Domyślne...",                         IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "Znak końca wiersza"
         BEGIN
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index c6288ab34..a9f3e8325 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Novo\tCtrl+N",                                           IDM_FILE_NEW
         MENUITEM "&Abrir...\tCtrl+O",                                       IDM_FILE_OPEN
-        MENUITEM "Re&verter\tF5",                                           IDM_FILE_REVERT
         MENUITEM "&Salvar\tCtrl+S",                                         IDM_FILE_SAVE
         MENUITEM "Salvar &Como...\tF6",                                     IDM_FILE_SAVEAS
         MENUITEM "Salvar &Copia...\tCtrl+F6",                               IDM_FILE_SAVECOPY
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Abri &Gerenciador de Arquivos",   IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "&Codificação"
         BEGIN
-            MENUITEM "&ANSI",                    IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                 IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",      IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",         IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 com &Assinatura",    IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Mais...\tF9",             IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",             CMD_RECODEDEFAULT
+                MENUITEM "A&NSI\tCtrl+Shift+A",            CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",             CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",       CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII como UTF-&8\tCtrl+Shift+F8",      CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",              CMD_RELOADFORCEDETECTION
+                MENUITEM "Ignorar &Tags de Codificação\tAlt+F8",  CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                          IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                       IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",            IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",               IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 com &Assinatura",          IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Recodificar para o &Padrão",                  CMD_RECODEDEFAULT
-            MENUITEM "Recodificar para &ANSI\tCtrl+Shift+A",        CMD_RECODEANSI
-            MENUITEM "Recodificar para &OEM\tCtrl+Shift+O",         CMD_RECODEOEM
-            MENUITEM "Recodificar para &GB18030\tCtrl+Shift+F10",   CMD_RECODEGB18030
-            MENUITEM "Recodificar para Análise UCHARDET",           CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII como UTF-&8\tCtrl+Shift+F8",      CMD_RELOADASCIIASUTF8
-            MENUITEM "Ignorar &Tags de Codificação\tAlt+F8",  CMD_RELOADNOFILEVARS
-            MENUITEM "&Recodificar...\tF8",                   IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Definir &Padrão...",                    IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "Fin&ais de Linha"
         BEGIN
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index 50e35b69f..9c4b13606 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Novo\tCtrl+N",                                        IDM_FILE_NEW
         MENUITEM "&Abrir...\tCtrl+O",                                    IDM_FILE_OPEN
-        MENUITEM "Re&verter\tF5",                                        IDM_FILE_REVERT
         MENUITEM "&Guardar\tCtrl+S",                                     IDM_FILE_SAVE
         MENUITEM "Guardar c&omo...\tF6",                                 IDM_FILE_SAVEAS
         MENUITEM "Guardar &cópia...\tCtrl+F6",                           IDM_FILE_SAVECOPY
@@ -79,41 +78,49 @@ BEGIN
         BEGIN
             MENUITEM "&Procurar em ficheiros\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
-            MENUITEM "&Nova janela\tAlt+N",              IDM_FILE_NEWWINDOW
-            MENUITEM "Jan&ela vazia\tAlt+Shift+N",       IDM_FILE_NEWWINDOW2
+            MENUITEM "&Nova janela\tAlt+N",                IDM_FILE_NEWWINDOW
+            MENUITEM "Jan&ela vazia\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
             MENUITEM SEPARATOR
-            MENUITEM "&Reiniciar com elevação",          IDM_FILE_LAUNCH_ELEVATED
+            MENUITEM "&Reiniciar com elevação",            IDM_FILE_LAUNCH_ELEVATED
             MENUITEM SEPARATOR
-            MENUITEM "Executar &documento\tCtrl+L",      IDM_FILE_LAUNCH
-            MENUITEM "Abrir c&om...\tAlt+L",             IDM_FILE_OPENWITH
-            MENUITEM "&Comando...\tCtrl+R",              IDM_FILE_RUN
+            MENUITEM "Executar &documento\tCtrl+L",        IDM_FILE_LAUNCH
+            MENUITEM "Abrir c&om...\tAlt+L",               IDM_FILE_OPENWITH
+            MENUITEM "&Comando...\tCtrl+R",                IDM_FILE_RUN
             MENUITEM SEPARATOR
-            MENUITEM "Modelo Web &1\tCtrl+Shift+1",      CMD_WEBACTION1
-            MENUITEM "Modelo Web &2\tCtrl+Shift+2",      CMD_WEBACTION2
+            MENUITEM "Modelo Web &1\tCtrl+Shift+1",        CMD_WEBACTION1
+            MENUITEM "Modelo Web &2\tCtrl+Shift+2",        CMD_WEBACTION2
             MENUITEM SEPARATOR
-            MENUITEM "Abrir &Explorador de ficheiros",   IDM_FILE_EXPLORE_DIR
+            MENUITEM "Abrir &Explorador de ficheiros",     IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "&Codificação"
         BEGIN
-            MENUITEM "&ANSI",                              IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                           IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                   IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 com a&ssinatura",              IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Mais...\tF9",                       IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",                 CMD_RECODEDEFAULT
+                MENUITEM "&ANSI\tCtrl+Shift+A",                CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",                 CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",           CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII como UTF-&8\tCtrl+Shift+F8",          CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",                  CMD_RELOADFORCEDETECTION
+                MENUITEM "Ignorar e&tiquetas de codificação\tAlt+F8", CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                         IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                      IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",           IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",              IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 com a&ssinatura",         IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Recodificar para Pa&drão",                  CMD_RECODEDEFAULT
-            MENUITEM "Recodificar para &ANSI\tCtrl+Shift+A",      CMD_RECODEANSI
-            MENUITEM "Recodificar para &OEM\tCtrl+Shift+O",       CMD_RECODEOEM
-            MENUITEM "Recodificar para &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
-            MENUITEM "Recodificar para análise UCHARDET",         CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII como UTF-&8\tCtrl+Shift+F8",          CMD_RELOADASCIIASUTF8
-            MENUITEM "Ignorar e&tiquetas de codificação\tAlt+F8", CMD_RELOADNOFILEVARS
-            MENUITEM "&Recodificar...\tF8",                       IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Definir pa&drão...",                        IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "Fins de linha"
         BEGIN
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 8c9a19e21..d35523f4c 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Новый\tCtrl+N",              IDM_FILE_NEW
         MENUITEM "&Открыть...\tCtrl+O",         IDM_FILE_OPEN
-        MENUITEM "Откатит&ь изменения\tF5",     IDM_FILE_REVERT
         MENUITEM "&Сохранить\tCtrl+S",          IDM_FILE_SAVE
         MENUITEM "Сохранить &как...\tF6",       IDM_FILE_SAVEAS
         MENUITEM "Со&хранить копию...\tCtrl+F6", IDM_FILE_SAVECOPY
@@ -77,7 +76,7 @@ BEGIN
         END
         POPUP "&Запустить"
         BEGIN
-            MENUITEM "&Искать в файлах\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Искать в файлах\tCtrl+Shift+F",     IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "Копи&ю окна\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Пустое окно\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Открыть Прово&дник",                 IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "Ко&дировка"
         BEGIN
-            MENUITEM "&ANSI",                              IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                           IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                   IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 с BO&M",                       IDM_ENCODING_UTF8SIGN
-            MENUITEM "Е&щё...\tF9",                        IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",                    CMD_RECODEDEFAULT
+                MENUITEM "A&NSI\tCtrl+Shift+A",                   CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",                    CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",              CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "Переоткрыть в ASCII &как UTF-8\tCtrl+Shift+F8",  CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",                       CMD_RELOADFORCEDETECTION
+                MENUITEM "Игнорировать &теги кодировки\tAlt+F8",           CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",             IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                              IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                           IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",                IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",                   IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 с BO&M",                       IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",             IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Переоткрыть в ко&дировке по умолчанию",               CMD_RECODEDEFAULT
-            MENUITEM "Переоткрыть в A&NSI\tCtrl+Shift+A",                   CMD_RECODEANSI
-            MENUITEM "Переоткрыть в &OEM\tCtrl+Shift+O",                    CMD_RECODEOEM
-            MENUITEM "Переоткрыть в &GB18030\tCtrl+Shift+F10",              CMD_RECODEGB18030
-            MENUITEM "Переоткрыть с UCHARDET &анализом",                    CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "Переоткрыть в ASCII &как UTF-8\tCtrl+Shift+F8",       CMD_RELOADASCIIASUTF8
-            MENUITEM "Игнорировать &теги кодировки\tAlt+F8",                CMD_RELOADNOFILEVARS
-            MENUITEM "&Переоткрыть в...\tF8",                               IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "&Установить кодировку по умолчанию...",               IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",              IDM_ENCODING_SETDEFAULT
         END
         POPUP "Окончани&я строк"
         BEGIN
@@ -447,7 +454,7 @@ BEGIN
             MENUITEM "&Закрыть Notepad3",                   IDM_VIEW_ESCEXIT
         END
         MENUITEM "Сохранять перед запуском инструментов",   IDM_VIEW_SAVEBEFORERUNNINGTOOLS
-        MENUITEM "Calculate Tiny-E&xpressions",     IDM_VIEW_EVALTINYEXPRONSEL
+        MENUITEM "Calculate Tiny-E&xpressions",             IDM_VIEW_EVALTINYEXPRONSEL
         MENUITEM SEPARATOR
         POPUP "&История"
         BEGIN
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index 69d9130a1..8f188c0c6 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "&Nový\tCtrl+N",                                   IDM_FILE_NEW
         MENUITEM "&Otvoriť...\tCtrl+O",                             IDM_FILE_OPEN
-        MENUITEM "&Znovu načítať\tF5",                              IDM_FILE_REVERT
         MENUITEM "&Uložiť\tCtrl+S",                                 IDM_FILE_SAVE
         MENUITEM "Uložiť &ako...\tF6",                              IDM_FILE_SAVEAS
         MENUITEM "Uložiť &kópiu...\tCtrl+F6",                       IDM_FILE_SAVECOPY
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Otvoriť Pri&eskumníka",               IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                  IDM_FILE_REVERT
         POPUP "&Kódovanie"
         BEGIN
-            MENUITEM "&ANSI",                               IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                            IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                 IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                    IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 &Signature",                    IDM_ENCODING_UTF8SIGN
-            MENUITEM "&Viac...\tF9",                        IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",             CMD_RECODEDEFAULT
+                MENUITEM "&ANSI\tCtrl+Shift+A",            CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",             CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",       CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "AS&CII ako UTF-8\tCtrl+Shift+F8",        CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",               CMD_RELOADFORCEDETECTION
+                MENUITEM "&Ignorovať Tagy kódovania\tAlt+F8",      CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                          IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                       IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",            IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",               IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 &Signature",               IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Prekódovať na &predvolené",              CMD_RECODEDEFAULT
-            MENUITEM "Prekódovať na &ANSI\tCtrl+Shift+A",      CMD_RECODEANSI
-            MENUITEM "Prekódovať na &OEM\tCtrl+Shift+O",       CMD_RECODEOEM
-            MENUITEM "Prekódovať na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
-            MENUITEM "Prekódovať na UCHARDET analýzy",         CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "AS&CII ako UTF-8\tCtrl+Shift+F8",        CMD_RELOADASCIIASUTF8
-            MENUITEM "&Ignorovať Tagy kódovania\tAlt+F8",      CMD_RELOADNOFILEVARS
-            MENUITEM "Pr&ekódovať...\tF8",                     IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Nastaviť pre&dvolené...",                IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "Kon&ce riadkov"
         BEGIN
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index ad1904ba8..d217db95c 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "Ny\tCtrl+N",                                      IDM_FILE_NEW
         MENUITEM "Öppna...\tCtrl+O",                                IDM_FILE_OPEN
-        MENUITEM "Gå tillbaka till\tF5",                            IDM_FILE_REVERT
         MENUITEM "Spara\tCtrl+S",                                   IDM_FILE_SAVE
         MENUITEM "Spara som...\tF6",                                IDM_FILE_SAVEAS
         MENUITEM "Spara kopia...\tCtrl+F6",                         IDM_FILE_SAVECOPY
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "Öppna filutforskaren",                        IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Re&vert from File\tF5",                           IDM_FILE_REVERT
         POPUP "Teckenkodning"
         BEGIN
-            MENUITEM "&ANSI",                                       IDM_ENCODING_ANSI
-            MENUITEM "&Unicode",                                    IDM_ENCODING_UNICODE
-            MENUITEM "Unicode &Big Endian",                         IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-&8\tShift+F8",                            IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 med &signatur",                         IDM_ENCODING_UTF8SIGN
-            MENUITEM "Mer...\tF9",                                  IDM_ENCODING_SELECT
+            POPUP "&Revert from File as"
+            BEGIN
+                MENUITEM "&Default (Setting)",                      CMD_RECODEDEFAULT
+                MENUITEM "&ANSI\tCtrl+Shift+A",                     CMD_RECODEANSI
+                MENUITEM "&OEM\tCtrl+Shift+O",                      CMD_RECODEOEM
+                MENUITEM "&GB18030\tCtrl+Shift+F10",                CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "ASCII som UT&F-8\tCtrl+Shift+F8",         CMD_RELOADASCIIASUTF8
+                MENUITEM "Force U&CHARDET Analysis",                CMD_RELOADFORCEDETECTION
+                MENUITEM "Ignorera kodningstaggar\tAlt+F8",         CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF8",                  IDM_ENCODING_RECODE
+            END
+            POPUP "&Set Document as"
+            BEGIN
+                MENUITEM "&ANSI",                                   IDM_ENCODING_ANSI
+                MENUITEM "&Unicode",                                IDM_ENCODING_UNICODE
+                MENUITEM "Unicode &Big Endian",                     IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-&8\tShift+F8",                        IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 med &signatur",                     IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "&More Encodings...\tF9",                  IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Omkoda till standardkodning",                 CMD_RECODEDEFAULT
-            MENUITEM "Omkoda till &ANSI\tCtrl+Shift+A",             CMD_RECODEANSI
-            MENUITEM "Omkoda till &OEM\tCtrl+Shift+O",              CMD_RECODEOEM
-            MENUITEM "Omkoda till &GB18030\tCtrl+Shift+F10",        CMD_RECODEGB18030
-            MENUITEM "Omkoda till UCHARDET Analys",                 CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "ASCII som UTF-&8\tCtrl+Shift+F8",             CMD_RELOADASCIIASUTF8
-            MENUITEM "Ignorera kodningstaggar\tAlt+F8",             CMD_RELOADNOFILEVARS
-            MENUITEM "Omkoda...\tF8",                               IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "Ange standard...",                            IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding &Defaults...",                   IDM_ENCODING_SETDEFAULT
         END
         POPUP "Radslut"
         BEGIN
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index b3650c702..9405e88a2 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "新建(&N)\tCtrl+N",                                IDM_FILE_NEW
         MENUITEM "打开(&O)...\tCtrl+O",                             IDM_FILE_OPEN
-        MENUITEM "还原(&V)\tF5",                                    IDM_FILE_REVERT
         MENUITEM "保存(&S)\tCtrl+S",                                IDM_FILE_SAVE
         MENUITEM "另存为(&A)...\tF6",                               IDM_FILE_SAVEAS
         MENUITEM "保存副本(&C)...\tCtrl+F6",                        IDM_FILE_SAVECOPY
@@ -71,13 +70,13 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "复制路径到剪贴板(&D)"
         BEGIN
-            MENUITEM "仅文件名(&F)\tCtrl+F9",          IDM_EDIT_INSERT_FILENAME
-            MENUITEM "文件名和文件夹(&D)",             IDM_EDIT_INSERT_DIRNAME
+            MENUITEM "仅文件名(&F)\tCtrl+F9",                 IDM_EDIT_INSERT_FILENAME
+            MENUITEM "文件名和文件夹(&D)",                     IDM_EDIT_INSERT_DIRNAME
             MENUITEM "完整文件路径(&F)\tCtrl+Shift+F9",        IDM_EDIT_INSERT_PATHNAME
         END
         POPUP "启动(&L)"
         BEGIN
-            MENUITEM "在文件中查找(&S)...\tCtrl+Shift+F",           IDM_GREP_WIN_SEARCH
+            MENUITEM "在文件中查找(&S)...\tCtrl+Shift+F",      IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "新窗口(&N)\tAlt+N",                      IDM_FILE_NEWWINDOW
             MENUITEM "空窗口(&E)\tAlt+Shift+N",                IDM_FILE_NEWWINDOW2
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "打开资源管理器(&F)",                      IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Revert from File(&V)\tF5",                  IDM_FILE_REVERT
         POPUP "编码(&E)"
         BEGIN
-            MENUITEM "ANSI(&A)",                              IDM_ENCODING_ANSI
-            MENUITEM "Unicode(&U)",                           IDM_ENCODING_UNICODE
-            MENUITEM "Unicode BE(&B)",                        IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-8(&8)\tShift+F8",                   IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 带签名(&S)",                       IDM_ENCODING_UTF8SIGN
-            MENUITEM "更多编码(&M)...\tF9",                    IDM_ENCODING_SELECT
+            POPUP "Revert from File as(&R)"
+            BEGIN
+                MENUITEM "Default (Setting) (&D)",         CMD_RECODEDEFAULT
+                MENUITEM "ANSI(&N)\tCtrl+Shift+A",         CMD_RECODEANSI
+                MENUITEM "OEM(&O)\tCtrl+Shift+O",          CMD_RECODEOEM
+                MENUITEM "GB18030(&G)\tCtrl+Shift+F10",    CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "重载 ASCII 为 UTF-8(&F)\tCtrl+Shift+F8",   CMD_RELOADASCIIASUTF8
+                MENUITEM "Force UCHARDET Analysis(&C)",              CMD_RELOADFORCEDETECTION
+                MENUITEM "忽略编码标记(&I)\tAlt+F8",                  CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "Set Document as(&S)"
+            BEGIN
+                MENUITEM "ANSI(&A)",                          IDM_ENCODING_ANSI
+                MENUITEM "Unicode(&U)",                       IDM_ENCODING_UNICODE
+                MENUITEM "Unicode BE(&B)",                    IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-8(&8)\tShift+F8",               IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 带签名(&S)",                   IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF9",         IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "重新编码为默认(&D)",                        CMD_RECODEDEFAULT
-            MENUITEM "重新编码为 ANSI(&N)\tCtrl+Shift+A",         CMD_RECODEANSI
-            MENUITEM "重新编码为 OEM(&O)\tCtrl+Shift+O",          CMD_RECODEOEM
-            MENUITEM "重新编码为 GB18030(&G)\tCtrl+Shift+F10",    CMD_RECODEGB18030
-            MENUITEM "重新编码为 UCHARDET 分析(&C)",              CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "重载 ASCII 为 UTF-8(&F)\tCtrl+Shift+F8",    CMD_RELOADASCIIASUTF8
-            MENUITEM "忽略编码标记(&I)\tAlt+F8",                  CMD_RELOADNOFILEVARS
-            MENUITEM "选择编码(&R)...\tF8",                       IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "设置默认(&T)...",                           IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding Defaults(&D)...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "换行(&G)"
         BEGIN
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index 38f150d19..2a21929e0 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -59,7 +59,6 @@ BEGIN
     BEGIN
         MENUITEM "新增(&N)\tCtrl+N",                                IDM_FILE_NEW
         MENUITEM "開啟舊檔(&O)...\tCtrl+O",                         IDM_FILE_OPEN
-        MENUITEM "還原(&V)\tF5",                                    IDM_FILE_REVERT
         MENUITEM "儲存(&S)\tCtrl+S",                                IDM_FILE_SAVE
         MENUITEM "另存為(&A)...\tF6",                               IDM_FILE_SAVEAS
         MENUITEM "另存拷貝為(&C)...\tCtrl+F6",                      IDM_FILE_SAVECOPY
@@ -77,7 +76,7 @@ BEGIN
         END
         POPUP "啟動(&L)"
         BEGIN
-            MENUITEM "在檔案中查詢(&S)...\tCtrl+Shift+F",           IDM_GREP_WIN_SEARCH
+            MENUITEM "在檔案中查詢(&S)...\tCtrl+Shift+F",      IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "新視窗(&N)\tAlt+N",                      IDM_FILE_NEWWINDOW
             MENUITEM "空視窗(&E)\tAlt+Shift+N",                IDM_FILE_NEWWINDOW2
@@ -94,26 +93,34 @@ BEGIN
             MENUITEM "打開檔案總管(&F)",                      IDM_FILE_EXPLORE_DIR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Revert from File(&V)\tF5",                  IDM_FILE_REVERT
         POPUP "編碼(&E)"
         BEGIN
-            MENUITEM "ANSI(&A)",                              IDM_ENCODING_ANSI
-            MENUITEM "Unicode(&U)",                           IDM_ENCODING_UNICODE
-            MENUITEM "Unicode BE(&B)",                        IDM_ENCODING_UNICODEREV
-            MENUITEM "UTF-8(&8)\tShift+F8",                   IDM_ENCODING_UTF8
-            MENUITEM "UTF-8 帶簽名(&S)",                       IDM_ENCODING_UTF8SIGN
-            MENUITEM "更多編碼(&M)...\tF9",                    IDM_ENCODING_SELECT
+            POPUP "Revert from File as(&R)"
+            BEGIN
+                MENUITEM "Default (Setting) (&D)",         CMD_RECODEDEFAULT
+                MENUITEM "ANSI(&N)\tCtrl+Shift+A",         CMD_RECODEANSI
+                MENUITEM "OEM(&O)\tCtrl+Shift+O",          CMD_RECODEOEM
+                MENUITEM "GB18030(&G)\tCtrl+Shift+F10",    CMD_RECODEGB18030
+                MENUITEM SEPARATOR
+                MENUITEM "重新載入 ASCII 為 UTF-8(&F)\tCtrl+Shift+F8",    CMD_RELOADASCIIASUTF8
+                MENUITEM "Force UCHARDET Analysis(&C)",                  CMD_RELOADFORCEDETECTION
+                MENUITEM "忽略編碼標記(&I)\tAlt+F8",                      CMD_RELOADNOFILEVARS
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF8",         IDM_ENCODING_RECODE
+            END
+            POPUP "Set Document as(&S)"
+            BEGIN
+                MENUITEM "ANSI(&A)",                              IDM_ENCODING_ANSI
+                MENUITEM "Unicode(&U)",                           IDM_ENCODING_UNICODE
+                MENUITEM "Unicode BE(&B)",                        IDM_ENCODING_UNICODEREV
+                MENUITEM "UTF-8(&8)\tShift+F8",                   IDM_ENCODING_UTF8
+                MENUITEM "UTF-8 帶簽名(&S)",                       IDM_ENCODING_UTF8SIGN
+                MENUITEM SEPARATOR
+                MENUITEM "More Encodings(&M)...\tF9",             IDM_ENCODING_SELECT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "重新編碼為預設(&D)",                        CMD_RECODEDEFAULT
-            MENUITEM "重新編碼為 ANSI(&N)\tCtrl+Shift+A",         CMD_RECODEANSI
-            MENUITEM "重新編碼為 OEM(&O)\tCtrl+Shift+O",          CMD_RECODEOEM
-            MENUITEM "重新編碼為 GB18030(&G)\tCtrl+Shift+F10",    CMD_RECODEGB18030
-            MENUITEM "重新編碼為 UCHARDET 分析(&C)",                  CMD_RELOADFORCEDETECTION
-            MENUITEM SEPARATOR
-            MENUITEM "重新載入 ASCII 為 UTF-8(&F)\tCtrl+Shift+F8",    CMD_RELOADASCIIASUTF8
-            MENUITEM "忽略編碼標記(&I)\tAlt+F8",                  CMD_RELOADNOFILEVARS
-            MENUITEM "選擇編碼(&R)...\tF8",                       IDM_ENCODING_RECODE
-            MENUITEM SEPARATOR
-            MENUITEM "設定預設(&T)...",                           IDM_ENCODING_SETDEFAULT
+            MENUITEM "Set Encoding Defaults(&D)...",          IDM_ENCODING_SETDEFAULT
         END
         POPUP "換行(&G)"
         BEGIN
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 589191246..d8324cb71 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.826.1"
+    version="5.20.828.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index e89204960..e41cdeb6c 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 826
+#define VERSION_REV 828
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 444
 #define ONIGURUMA_REGEX_VER 6.9.5