Bug 289444 Give prefs panels titles a unique name (mailnews patch)

r=mnyromyr sr=neil.parkwaycc.co.uk
2005-09-10 15:51:19 +00:00 · 2005-09-10 15:51:19 +00:00 · 47871c9255
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@ -8,7 +8,7 @@
      xmlns:nc="http://home.netscape.com/NC-rdf#"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      onload="onLoad();"
-      headertitle="&pane.title;">
+      headertitle="&pref.addressing.title;">

  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
  <script type="application/x-javascript">
--- a/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
@ -42,7 +42,7 @@

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        title="&window.title;"
+        title="&pref.ldap.window.title;"
        buttons="accept,cancel,help"
        onload="onInitEditDirectories();"
        ondialogaccept="return onAccept();"
--- a/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
+++ b/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
@ -35,7 +35,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                            "Addressing">
+<!ENTITY pref.addressing.title                 "Addressing">
 <!ENTITY emailCollectiontitle.label            "Email Address Collection">
 <!ENTITY emailCollectionPicker.label           "Add email addresses to my:">
 <!ENTITY emailCollectionPicker.accesskey       "m">
--- a/mailnews/addrbook/prefs/resources/locale/en-US/pref-directory.dtd
+++ b/mailnews/addrbook/prefs/resources/locale/en-US/pref-directory.dtd
@ -36,8 +36,7 @@
 ***** END LICENSE BLOCK ***** -->

 <!-- LOCALIZATION NOTE (window.title) : do not translate "LDAP" in below line -->
-<!ENTITY window.title              "LDAP Directory Servers">
-<!ENTITY pane.title                "Directory">
+<!ENTITY pref.ldap.window.title    "LDAP Directory Servers">
 <!ENTITY directory.label           "Add a directory">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "LDAP Directory Server:">
--- a/mailnews/base/prefs/resources/content/pref-labels.xul
+++ b/mailnews/base/prefs/resources/content/pref-labels.xul
@ -48,7 +48,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-labels.xul');"
-      headertitle="&pane.title;">
+      headertitle="&pref.labels.title;">

  <popupset id="aTooltipSet"/>

@ -61,7 +61,7 @@
  <script type="application/x-javascript" src="chrome://messenger/content/pref-labels.js"/>

  <groupbox>
-    <caption label="&labelsSettings.label;"/>
+    <caption label="&labelsSettings.caption;"/>

  <description>&displayText.label;</description>

--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@ -46,7 +46,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-mailnews.xul');"
-      headertitle="&pane.title;">
+      headertitle="&pref.mailnews.title;">

  <script type="application/x-javascript" src="chrome://messenger/content/pref-mailnews.js"/>

--- a/mailnews/base/prefs/resources/content/pref-notifications.xul
+++ b/mailnews/base/prefs/resources/content/pref-notifications.xul
@ -46,7 +46,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-notifications.xul');"
-      headertitle="&pane.title;"
+      headertitle="&pref.notifications.title;"
      id="mailNotificationsPage">

  <script type="application/x-javascript" src="chrome://messenger/content/pref-notifications.js"/>
--- a/mailnews/base/prefs/resources/content/pref-offline.xul
+++ b/mailnews/base/prefs/resources/content/pref-offline.xul
@ -47,7 +47,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-offline.xul');"
-      headertitle="&boxHeader;">
+      headertitle="&pref.offline.title;">

  <script type="application/x-javascript">
  <![CDATA[
@ -71,7 +71,7 @@
  </script>

 <groupbox>
-  <caption label="&rHeader;"/>
+  <caption label="&pref.offline.caption;"/>

  <label value="&textStartUp;"/>
    <radiogroup id="whenStartingUp" class="indent"
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@ -44,7 +44,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
-      headertitle="&pane.title;">
+      headertitle="&pref.receipts.title;">

  <script type="application/x-javascript">
  <![CDATA[
@ -56,7 +56,7 @@


  <groupbox>
-    <caption label="&pane.title;"/>
+    <caption label="&pref.receipts.caption;"/>

    <vbox id="returnReceiptSettings" align="start">
      <checkbox id="alwaysRequest" label="&requestReceipt.label;"
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@ -7,7 +7,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
-      headertitle="&pane.title;">
+      headertitle="&pref.viewing.messages.title;">

  <script type="application/x-javascript">
  <![CDATA[
--- a/mailnews/base/prefs/resources/locale/en-US/pref-labels.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-labels.dtd
@ -35,8 +35,8 @@
   -
   - ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                 "Labels">
-<!ENTITY labelsSettings.label       "Customize Labels">
+<!ENTITY pref.labels.title          "Labels">
+<!ENTITY labelsSettings.caption     "Customize Labels">
 <!ENTITY displayText.label          "Labels can be used to categorize and prioritize your messages.  Modify the appearance of Labels using the settings below.">
 <!ENTITY restoreDefaults.label      "Restore Defaults">
 <!ENTITY restoreDefaults.accesskey  "R">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@ -35,7 +35,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                       "Mail &amp; Newsgroups">
+<!ENTITY pref.mailnews.title              "Mail &amp; Newsgroups">
 <!ENTITY generalSettings.label            "General Settings">
 <!ENTITY confirmMove.label                "Confirm when moving folders to the Trash">
 <!ENTITY confirmMove.accesskey            "C">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
@ -35,7 +35,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                       "Notifications">
+<!ENTITY pref.notifications.title         "Notifications">
 <!ENTITY newMessagesArrive.label          "When new messages arrive:">
 <!ENTITY playSound.label                  "Play a sound">
 <!ENTITY playSound.accesskey              "P">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
@ -1,28 +1,28 @@
 <!-- extracted from content/pref-offline.xul -->

 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
-<!ENTITY boxHeader  "Offline &amp; Disk Space">
-<!ENTITY rHeader  "Offline">
-<!ENTITY textStartUp   "When starting up:">
-<!ENTITY radioRememberPrevState "Remember previous online state">
+<!ENTITY pref.offline.title               "Offline &amp; Disk Space">
+<!ENTITY pref.offline.caption             "Offline">
+<!ENTITY textStartUp                      "When starting up:">
+<!ENTITY radioRememberPrevState           "Remember previous online state">
 <!ENTITY radioRememberPrevState.accesskey "R">
-<!ENTITY radioAskMe "Ask me for online state at startup">
-<!ENTITY radioAskMe.accesskey "A">
-<!ENTITY textGoingOnline   "Send unsent messages when going online?">
-<!ENTITY radioAutoSend  "Yes">
-<!ENTITY radioAutoSend.accesskey  "Y">
-<!ENTITY radioNotSend  "No">
-<!ENTITY radioNotSend.accesskey  "N">
-<!ENTITY radioAskUnsent  "Ask me">
-<!ENTITY radioAskUnsent.accesskey  "s">
-<!ENTITY textGoingOffline   "Download messages for offline use when going offline?">
-<!ENTITY radioAutoDownload  "Yes">
-<!ENTITY radioAutoDownload.accesskey  "e">
-<!ENTITY radioNotDownload  "No">
-<!ENTITY radioNotDownload.accesskey  "o">
-<!ENTITY radioAskDownload  "Ask me">
-<!ENTITY radioAskDownload.accesskey  "k">
-<!ENTITY Diskspace "Disk Space">
-<!ENTITY offlineCompact.label "Compact folders when it will save over">
-<!ENTITY offlineCompact.accesskey "C">
-<!ENTITY kb.label "KB">
+<!ENTITY radioAskMe                       "Ask me for online state at startup">
+<!ENTITY radioAskMe.accesskey             "A">
+<!ENTITY textGoingOnline                  "Send unsent messages when going online?">
+<!ENTITY radioAutoSend                    "Yes">
+<!ENTITY radioAutoSend.accesskey          "Y">
+<!ENTITY radioNotSend                     "No">
+<!ENTITY radioNotSend.accesskey           "N">
+<!ENTITY radioAskUnsent                   "Ask me">
+<!ENTITY radioAskUnsent.accesskey         "s">
+<!ENTITY textGoingOffline                 "Download messages for offline use when going offline?">
+<!ENTITY radioAutoDownload                "Yes">
+<!ENTITY radioAutoDownload.accesskey      "e">
+<!ENTITY radioNotDownload                 "No">
+<!ENTITY radioNotDownload.accesskey       "o">
+<!ENTITY radioAskDownload                 "Ask me">
+<!ENTITY radioAskDownload.accesskey       "k">
+<!ENTITY Diskspace                        "Disk Space">
+<!ENTITY offlineCompact.label             "Compact folders when it will save over">
+<!ENTITY offlineCompact.accesskey         "C">
+<!ENTITY kb.label                         "KB">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@ -36,8 +36,8 @@
 ***** END LICENSE BLOCK ***** -->

 <!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
-<!ENTITY pane.title                   "Return Receipts">
-<!ENTITY pane.description             "Settings for requesting or returning receipts">
+<!ENTITY pref.receipts.title          "Return Receipts">
+<!ENTITY pref.receipts.caption        "Return Receipts">
 <!ENTITY requestReceipt.label         "When sending messages, always request a return receipt">
 <!ENTITY requestReceipt.accesskey     "W">
 <!-- LOCALIZATION NOTE dsn.label: don't translate "DSN"  -->
--- a/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
@ -36,8 +36,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                       "Message Display">
-<!ENTITY pane.description                 "Settings for message display">
+<!ENTITY pref.viewing.messages.title      "Message Display">
 <!ENTITY style.label                      "Style:">
 <!ENTITY style.accesskey                  "t">
 <!ENTITY regular.label                    "Regular">
--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@ -11,7 +11,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="populateFonts();parent.initPanel('chrome://messenger/content/messengercompose/pref-composing_messages.xul');"
-      headertitle="&pane.title;">
+      headertitle="&pref.composing.messages.title;">
    
  <script type="application/x-javascript">
  <![CDATA[
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@ -6,7 +6,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="Init()"
-      headertitle="&pane.title;">
+      headertitle="&pref.formatting.title;">

  <script type="application/x-javascript">
  <![CDATA[
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
@ -36,7 +36,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                           "Composition">
+<!ENTITY pref.composing.messages.title        "Composition">
 <!ENTITY forwardReply.label                   "Forwarding Messages">
 <!ENTITY forwardMsg.label                     "Forward messages:">
 <!ENTITY inline.label                         "Inline">
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
@ -35,8 +35,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY pane.title                   "Send Format">
-<!ENTITY pane.description             "Message formatting">
+<!ENTITY pref.formatting.title        "Send Format">
 <!ENTITY sendMail.label               "Send Format">
 <!ENTITY sendMaildesc.label           "When sending formatted (HTML) messages and one or more recipients are not listed as being able to receive HTML:">
 <!ENTITY askMe.label                  "Ask me what to do (Mail prompts you to choose a format)">