From f850e46888ace9bf69324d1d56eecec7076788b7 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Sat, 3 Aug 2019 10:54:53 +0200
Subject: [PATCH] Bug 1571181 - Add our own menubar.ftl for the charset
 menuitem. r=jorgk DONTBUILD

--HG--
extra : amend_source : 04c7e39a2457b268b1785ca7375743ab098a6ae5
---
 common/src/viewSource.xul                            | 4 ++++
 mail/base/content/messageWindow.xul                  | 1 +
 mail/base/content/messenger.xul                      | 1 +
 mail/components/compose/content/messengercompose.xul | 1 +
 mail/locales/en-US/messenger/menubar.ftl             | 9 +++++++++
 5 files changed, 16 insertions(+)
 create mode 100644 mail/locales/en-US/messenger/menubar.ftl

diff --git a/common/src/viewSource.xul b/common/src/viewSource.xul
index ea22ef0f0e..76fe8d2000 100644
--- a/common/src/viewSource.xul
+++ b/common/src/viewSource.xul
@@ -34,6 +34,10 @@
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
+<linkset>
+  <html:link rel="localization" href="messenger/menubar.ftl"/>
+</linkset>
+
   <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://global/content/printUtils.js"/>
 #ifndef MOZ_SUITE
diff --git a/mail/base/content/messageWindow.xul b/mail/base/content/messageWindow.xul
index 06acfdeb3b..c25c0328aa 100644
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -80,6 +80,7 @@
 
   <linkset>
     <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
+    <html:link rel="localization" href="messenger/menubar.ftl"/>
   </linkset>
 
   <script src="chrome://global/content/globalOverlay.js"/>
diff --git a/mail/base/content/messenger.xul b/mail/base/content/messenger.xul
index 8ead8bea18..9811e59d28 100644
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -100,6 +100,7 @@
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
+  <html:link rel="localization" href="messenger/menubar.ftl"/>
 </linkset>
 
 <script src="chrome://global/content/globalOverlay.js"/>
diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
index 25acd817a6..d57cc39436 100644
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -60,6 +60,7 @@
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
+  <html:link rel="localization" href="messenger/menubar.ftl"/>
 </linkset>
 
 <script src="chrome://global/content/printUtils.js"/>
diff --git a/mail/locales/en-US/messenger/menubar.ftl b/mail/locales/en-US/messenger/menubar.ftl
new file mode 100644
index 0000000000..7c50e15809
--- /dev/null
+++ b/mail/locales/en-US/messenger/menubar.ftl
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+## View Menu
+
+menu-view-charset =
+    .label = Text Encoding
+    .accesskey = c