From 8fa1f89273fc5022775e237b04c184661c7fffb1 Mon Sep 17 00:00:00 2001
From: Geoff Lankow <geoff@darktrojan.net>
Date: Mon, 15 Oct 2018 20:25:03 +1300
Subject: [PATCH] Bug 1489825 - Move string for calendar preferences label to
 mail's preferences.dtd; r=aceman, Fallen

---
 calendar/lightning/content/messenger-overlay-preferences.js    | 3 ---
 mail/components/preferences/aboutPreferences.xul               | 2 +-
 .../locales/en-US/chrome/messenger/preferences/preferences.dtd | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/calendar/lightning/content/messenger-overlay-preferences.js b/calendar/lightning/content/messenger-overlay-preferences.js
index c2cd68dede..591cf3d196 100644
--- a/calendar/lightning/content/messenger-overlay-preferences.js
+++ b/calendar/lightning/content/messenger-overlay-preferences.js
@@ -16,9 +16,6 @@ var gLightningPane = {
         ltnPrefs.addEventListener("select", gLightningPane.tabSelectionChanged.bind(this));
         this.mInitialized = true;
 
-        let categoryButton = document.querySelector('#category-box radio[pane="paneLightning"]');
-        categoryButton.label = document.getElementById("paneLightning").label;
-
         let elements = document.querySelectorAll("#paneLightning preference");
         for (let element of elements) {
             element.updateElements();
diff --git a/mail/components/preferences/aboutPreferences.xul b/mail/components/preferences/aboutPreferences.xul
index f5d46a79cc..ff8a1c593e 100644
--- a/mail/components/preferences/aboutPreferences.xul
+++ b/mail/components/preferences/aboutPreferences.xul
@@ -53,6 +53,6 @@
 #include privacy.inc.xul
 #include security.inc.xul
 #include applications.inc.xul
-  <prefpane id="paneLightning"/>
+  <prefpane id="paneLightning" label="&paneLightning.title;"/>
 #include advanced.inc.xul
 </preftab>
diff --git a/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd b/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
index 396b6ae51c..5d3dcde547 100644
--- a/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
@@ -19,6 +19,7 @@
 <!ENTITY paneAttachments.title    "Attachments">
 <!ENTITY panePrivacy.title        "Privacy">
 <!ENTITY paneSecurity.title       "Security">
+<!ENTITY paneLightning.title      "Calendar">
 <!ENTITY paneAdvanced.title       "Advanced">
 <!ENTITY paneAccount.title        "Accounts">