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

p=giacomo.magnini@portalis.it r=kairo sr=neil.parkwaycc.co.uk a=chofmann
2005-05-02 11:05:42 +00:00 · 2005-05-02 11:05:42 +00:00 · 470df97578
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@ -47,7 +47,7 @@

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

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

  <groupbox id="advancedSettings" align="start">
-    <caption label="&advancedTitle.label;"/>
+    <caption label="&pref.advanced.caption;"/>
    <vbox align="start" id="contentEnablingBox">
      <checkbox id="advancedJavaAllow" label="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
                prefstring="security.enable_java"
--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@ -47,7 +47,7 @@
 ]>
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel(panel);"
-      headertitle="&lHeader;">
+      headertitle="&pref.appearance.title;">

  <script type="application/x-javascript">
  <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.xul
@ -44,7 +44,7 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.applications.title;">

  <stringbundle id="bundle_prefApplications"
                src="chrome://communicator/locale/pref/pref-applications.properties"/>
@ -58,7 +58,7 @@
    </script>
        
  <groupbox flex="1">
-    <caption label="&descript;"/>
+    <caption label="&pref.applications.caption;"/>
    <vbox flex="1">
      <label value="&fileTypes.label;" control="appList"/>
      <hbox flex="1">
--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@ -47,7 +47,7 @@

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

  <script type="application/x-javascript">
  <![CDATA[
@ -69,7 +69,7 @@
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-cache.js"/>

  <groupbox>
-    <caption label="&cacheTitle.label;"/>
+    <caption label="&pref.cache.caption;"/>
    
    <description>&cachePara;</description>

--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@ -44,7 +44,7 @@

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

  <script type="application/x-javascript">
  <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@ -45,7 +45,7 @@

 <page id="cookiesPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="init();"
-      headertitle="&lHeader;">
+      headertitle="&pref.cookies.title;">

  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>

--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@ -43,7 +43,7 @@

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

  <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@ -41,7 +41,7 @@
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.fonts.title;">

  <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
--- a/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-history.xul
@ -43,7 +43,7 @@

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

  <script type="application/x-javascript">

@ -103,7 +103,7 @@
  </script>
 
  <groupbox>
-    <caption label="&header3.label;"/>
+    <caption label="&pref.history.caption;"/>
    <description>&historyPages.label;</description>
    <hbox align="center">
      <label value="&pageHis.label;" accesskey="&pageHis.accesskey;" control="histDay"/>
@ -120,7 +120,7 @@
  
  <!-- no honey, I haven't been viewing porn, honest! -->
  <groupbox>
-    <caption label="&locationBarHistory.label;"/>
+    <caption label="&locationBarHistory.caption;"/>
    <hbox align="center">
      <description flex="1">&clearLocationBar.label;</description>
      <hbox align="center" pack="end">
--- a/xpfe/components/prefwindow/resources/content/pref-http.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-http.xul
@ -42,7 +42,7 @@
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-http.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-http.xul');checkPipelining();checkPipeliningProxy();"
-      headertitle="&lHeader;">
+      headertitle="&pref.http.title;">

  <script type="application/x-javascript" 
          src="chrome://communicator/content/pref/pref-http.js"/>
--- a/xpfe/components/prefwindow/resources/content/pref-images.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-images.xul
@ -49,7 +49,7 @@

 <page id="imagesPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="init();"
-      headertitle="&lHeader;">
+      headertitle="&pref.images.title;">
          
  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>

--- a/xpfe/components/prefwindow/resources/content/pref-keynav.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-keynav.xul
@ -43,7 +43,7 @@

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

  <script type="application/x-javascript" 
          src="chrome://communicator/content/pref/pref-keynav.js"/>
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@ -51,7 +51,7 @@

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

  <script type="application/x-javascript">
  <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@ -46,7 +46,7 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      id="pref-navigator"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.navigator.title;">

  <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-navigator.js"/>
--- a/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-policies.xul
@ -9,7 +9,7 @@

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.policies.title;">
  <groupbox>
  
    <description>&zoneIntro.label;</description>
--- a/xpfe/components/prefwindow/resources/content/pref-popups.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-popups.xul
@ -46,7 +46,7 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      id="popupsPanel"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-popups.xul');"
-      headertitle="&title;">
+      headertitle="&pref.popups.title;">
          
  <script type="application/x-javascript">
    <![CDATA[
@ -216,7 +216,7 @@
  </script>

  <groupbox id="popupsArea">
-    <caption label="&popupBlocking.label;"/>
+    <caption label="&pref.popups.caption;"/>

    <hbox align="center">      
      <checkbox id="popupPolicy" label="&popupBlock.label;" accesskey="&popupBlock.accesskey;"
--- a/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@ -41,7 +41,7 @@
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.proxies.title;">

  <script type="application/x-javascript">
  <![CDATA[
@ -60,7 +60,7 @@
                src="chrome://pref/locale/prefutilities.properties"/>
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>

-  <description>&proxy.description;</description>  
+  <description>&pref.proxies.desc;</description>  
  <groupbox>
    <caption label="&proxyTitle.label;"/>
    <radiogroup id="networkProxyType" prefstring="network.proxy.type" align="stretch">
--- a/xpfe/components/prefwindow/resources/content/pref-scripts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-scripts.xul
@ -42,7 +42,7 @@

 <page id="scriptsAndWindowPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-scripts.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.scripts.title;">
  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-scripts.js"/>
  <script type="application/x-javascript">
    <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-search.xul
@ -41,7 +41,7 @@
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"
-      headertitle="&lHeader;">
+      headertitle="&pref.search.title;">

  <script type="application/x-javascript">
  <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-security.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-security.xul
@ -40,7 +40,7 @@
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.security.title;">

  <script type="application/x-javascript">
  <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@ -50,7 +50,7 @@

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

  <stringbundle id="bundle_region"
                src="chrome://global-region/locale/region.properties"/>
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@ -5,7 +5,7 @@
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.smartUpdate.title;">
  
  <script type="application/x-javascript">
  <![CDATA[
--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@ -49,7 +49,7 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      xmlns:html="http://www.w3.org/1999/xhtml"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-themes.xul');"
-      headertitle="&lHeader;">
+      headertitle="&pref.themes.title;">

  <stringbundle id="bundle_prefutilities"
                src="chrome://communicator/locale/pref/prefutilities.properties"/>
--- a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@ -51,7 +51,7 @@

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

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

--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
@ -1,8 +1,8 @@

 <!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
-<!ENTITY lHeader                      "Advanced">
+<!ENTITY pref.advanced.title          "Advanced">

-<!ENTITY advancedTitle.label          "Features that help interpret web pages">
+<!ENTITY pref.advanced.caption        "Features that help interpret web pages">

 <!ENTITY autoLoadImgCheck.label       "Automatically load images"> 
 <!ENTITY autoLoadImgCheck.accesskey   "i">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
@ -1,13 +1,12 @@
 <!-- extracted from content/pref-appearance.xul -->

 <!--LOCALIZATION NOTE : FILE The Appearance prefs dialog.  -->
-<!ENTITY lHeader "Appearance">
+<!ENTITY pref.appearance.title "Appearance">
 <!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
    Place &brandShortName; in the phrase where the name of the application should
 	 appear
 -->
 <!ENTITY onStartLegend.label "When &brandShortName; starts up, open">
-<!ENTITY appear "Appearance">
 <!--LOCALIZATION NOTE (navCheck.label): DONT_TRANSLATE -->
 <!ENTITY navCheck.label "Navigator">
 <!ENTITY navCheck.accesskey "n">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
@ -1,8 +1,8 @@
 <!-- extracted from content/pref-applications.xul -->

 <!--LOCALIZATION NOTE : FILE The Applications prefs dialog -->
-<!ENTITY lHeader                        "Helper Applications">
-<!ENTITY descript                       "Specify how to handle files of each file type">
+<!ENTITY pref.applications.title        "Helper Applications">
+<!ENTITY pref.applications.caption      "Specify how to handle files of each file type">
 <!ENTITY fileTypes.label                "File types:">
 <!ENTITY aimLaunchSelect.label          "AOL Instant Messenger Launch">
 <!ENTITY newTypeButton.label            "New Type...">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-bidi.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-bidi.dtd
@ -1,8 +1,8 @@
 <!-- extracted from content/pref-BidiOptions.xul -->

 <!--LOCALIZATION NOTE : FILE Bidi Options prefs dialog -->
-<!ENTITY title.label                         "Bidi Options">
-<!ENTITY lHeader                             "Bidi Options">
+<!ENTITY pref.bidi.title                     "Bidi Options">
+<!ENTITY pref.bidi.desc                      "Bidi Options">
 <!ENTITY direction.label                     "Default Direction">
 <!ENTITY directionLTR.label                  "Left to Right">
 <!ENTITY directionLTR.accesskey              "l">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
@ -1,8 +1,8 @@
 <!-- extracted from content/pref-cache.xul -->

 <!--LOCALIZATION NOTE : FILE Cache prefs dialog -->
-<!ENTITY  lHeader                       "Cache">
-<!ENTITY  cacheTitle.label              "Set Cache Options">
+<!ENTITY  pref.cache.title              "Cache">
+<!ENTITY  pref.cache.caption            "Set Cache Options">
 <!ENTITY  cachePara                     "The cache keeps copies of frequently visited web pages on your hard disk. (Clicking Reload always shows you the latest version of a page.)">
 <!ENTITY  diskCache.label               "Size:">
 <!ENTITY  diskCache.accesskey           "S">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-charset.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-charset.dtd
@ -38,15 +38,15 @@
 <!-- extracted from ./pref-charset.xul -->

 <!-- LOCALIZATION NOTE  Character Encoding Preferences Dialog: Do NOT localize the term "Character Encoding"  -->
-<!ENTITY charset.customize.title.label			    "Customize Character Encoding">
-<!ENTITY charset.customize.left.header			    "Character Encoding">
-<!ENTITY charset.customize.right.header		    "Select Supported Character Encodings">
+<!ENTITY charset.customize.title.label          "Customize Character Encoding">
+<!ENTITY charset.customize.left.header          "Character Encoding">
+<!ENTITY charset.customize.right.header         "Select Supported Character Encodings">
 <!ENTITY charset.customize.current.label        "Active Character Encodings:">
 <!ENTITY charset.customize.reorder.label        "Reorder">
 <!ENTITY charset.customize.remove.label         "Remove">
 <!ENTITY charset.customize.additional.label     "Available Character Encodings:">
 <!ENTITY charset.customize.add.label            "Add">
-<!ENTITY charset.customize.cancel.label		      "Cancel">
+<!ENTITY charset.customize.cancel.label         "Cancel">
 <!ENTITY charset.customize.save.label           "Save">
 <!ENTITY charset.customize.save.popup           "Please restart the browser for changes to take effect...">
 <!ENTITY charset.customize.moveUp.label         "Move Up">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
@ -1,7 +1,7 @@
 <!-- extracted from content/pref-colors.xul -->

 <!-- LOCALIZATION NOTE : FILE Color management prefs -->
-<!ENTITY  lHeader                         "Colors">
+<!ENTITY  pref.colors.title               "Colors">
 <!ENTITY  color                           "Text and Background">
 <!ENTITY  textColor.label                 "Text:">
 <!ENTITY  textColor.accesskey             "T">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
@ -1,4 +1,4 @@
-<!ENTITY lHeader                        "Cookies">
+<!ENTITY pref.cookies.title             "Cookies">

 <!-- cookies -->

--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-download.dtd
@ -1,31 +1,31 @@
-<!ENTITY lHeader "Downloads">
-<!ENTITY downloadBehavior.label "When starting a download">
-<!ENTITY downloadLocation.label "When saving a file">
-<!ENTITY finishedBehavior.label "When a download completes">
-<!ENTITY openDM.label "Open the download manager">
-<!ENTITY openDM.accesskey "m">
-<!ENTITY openProgressDialog.label "Open a progress dialog">
-<!ENTITY openProgressDialog.accesskey "p">
-<!ENTITY doNothing.label "Don't open anything">
-<!ENTITY doNothing.accesskey "D">
-<!ENTITY promptDownload.label "Prompt for download location and default to">
-<!ENTITY promptDownload.accesskey "r">
-<!ENTITY lastLocation.label "Last download folder">
-<!ENTITY lastLocation.accesskey "L">
-<!ENTITY specifiedLocation.label "Specified download folder">
-<!ENTITY specifiedLocation.accesskey "e">
-<!ENTITY autoDownload.label "Automatically download files to specified download folder">
-<!ENTITY autoDownload.accesskey "A">
-<!ENTITY downloadFolder.label "Current Download Folder:">
-<!ENTITY chooseDownloadFolder.label "Choose Folder...">
+<!ENTITY pref.download.title            "Downloads">
+<!ENTITY downloadBehavior.label         "When starting a download">
+<!ENTITY downloadLocation.label         "When saving a file">
+<!ENTITY finishedBehavior.label         "When a download completes">
+<!ENTITY openDM.label                   "Open the download manager">
+<!ENTITY openDM.accesskey               "m">
+<!ENTITY openProgressDialog.label       "Open a progress dialog">
+<!ENTITY openProgressDialog.accesskey   "p">
+<!ENTITY doNothing.label                "Don't open anything">
+<!ENTITY doNothing.accesskey            "D">
+<!ENTITY promptDownload.label           "Prompt for download location and default to">
+<!ENTITY promptDownload.accesskey       "r">
+<!ENTITY lastLocation.label             "Last download folder">
+<!ENTITY lastLocation.accesskey         "L">
+<!ENTITY specifiedLocation.label        "Specified download folder">
+<!ENTITY specifiedLocation.accesskey    "e">
+<!ENTITY autoDownload.label             "Automatically download files to specified download folder">
+<!ENTITY autoDownload.accesskey         "A">
+<!ENTITY downloadFolder.label           "Current Download Folder:">
+<!ENTITY chooseDownloadFolder.label     "Choose Folder...">
 <!ENTITY chooseDownloadFolder.accesskey "C">
-<!ENTITY playSound.label "Play a sound">
-<!ENTITY playSound.accesskey "s">
-<!ENTITY showAlert.label "Show an alert">
-<!ENTITY showAlert.accesskey "n">
-<!ENTITY browse.label "Browse...">
-<!ENTITY browse.accesskey "B">
-<!ENTITY preview.label "Preview">
-<!ENTITY preview.accesskey "v">
-<!ENTITY soundURL.label "Sound URL:">
-<!ENTITY soundURL.accesskey "U">
+<!ENTITY playSound.label                "Play a sound">
+<!ENTITY playSound.accesskey            "s">
+<!ENTITY showAlert.label                "Show an alert">
+<!ENTITY showAlert.accesskey            "n">
+<!ENTITY browse.label                   "Browse...">
+<!ENTITY browse.accesskey               "B">
+<!ENTITY preview.label                  "Preview">
+<!ENTITY preview.accesskey              "v">
+<!ENTITY soundURL.label                 "Sound URL:">
+<!ENTITY soundURL.accesskey             "U">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
@ -1,7 +1,7 @@
 <!-- extracted from content/pref-fonts.xul -->

 <!-- LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
-<!ENTITY  lHeader                                 "Fonts">
+<!ENTITY  pref.fonts.title                        "Fonts">

 <!ENTITY  language.label                          "Fonts for:">
 <!ENTITY  language.accesskey                      "t">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-history.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-history.dtd
@ -1,15 +1,15 @@
-<!ENTITY  lHeader                   "History">
+<!ENTITY  pref.history.title                "History">

-<!ENTITY  header3.label             "Browsing History">
-<!ENTITY  historyPages.label        "History is a list of previously visited pages.">
-<!ENTITY  pageHis.label             "Remember visited pages for the last">
-<!ENTITY  pageHis.accesskey         "a">
-<!ENTITY  days.label                "days">
-<!ENTITY  clearHistory.label        "Clear History">
-<!ENTITY  clearHistory.accesskey    "r">
+<!ENTITY  pref.history.caption              "Browsing History">
+<!ENTITY  historyPages.label                "History is a list of previously visited pages.">
+<!ENTITY  pageHis.label                     "Remember visited pages for the last">
+<!ENTITY  pageHis.accesskey                 "a">
+<!ENTITY  days.label                        "days">
+<!ENTITY  clearHistory.label                "Clear History">
+<!ENTITY  clearHistory.accesskey            "r">

-<!ENTITY  locationBarHistory.label  "Location Bar History">
-<!ENTITY  clearLocationBar.label    "Clear the list of sites stored in the location bar menu.">
+<!ENTITY  locationBarHistory.caption        "Location Bar History">
+<!ENTITY  clearLocationBar.label            "Clear the list of sites stored in the location bar menu.">
 <!ENTITY  clearLocationBarButton.label      "Clear Location Bar">
 <!ENTITY  clearLocationBarButton.accesskey  "b">
-  
+  
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-http.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-http.dtd
@ -1,5 +1,4 @@
-<!ENTITY lHeader "HTTP Networking">
-<!ENTITY rHeader "HTTP Network Preferences">
+<!ENTITY pref.http.title                     "HTTP Networking">

 <!-- Network-->
 <!ENTITY prefDirect.label                    "Direct Connection Options">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd
@ -1,4 +1,4 @@
-<!ENTITY lHeader                        "Images">
+<!ENTITY pref.images.title              "Images">

 <!ENTITY imageBlocking.label            "Image Acceptance Policy">

--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-keynav.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-keynav.dtd
@ -1,4 +1,4 @@
-<!ENTITY lHeader "Keyboard Navigation">
+<!ENTITY pref.keyNav.title "Keyboard Navigation">
 <!ENTITY tabNavigationBehavior.label "Tab Key Navigation">
 <!ENTITY tabNavigationLinks.label "Links">
 <!ENTITY tabNavigationLinks.accesskey "L">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
@ -1,7 +1,6 @@
 <!-- LOCALIZATION NOTE : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->

-<!ENTITY title.label                  "Mouse Wheel">
-<!ENTITY mouseWheelTitle.label        "Mouse wheel configuration">
+<!ENTITY pref.mouseWheel.title        "Mouse Wheel">
 <!ENTITY mouseWheelPanel.label        "Specify mouse wheel behavior when used with this modifier key: ">
 <!ENTITY mouseWheelPanel.accesskey    "w">
 <!ENTITY usingJustTheWheel.label      "No modifier key">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
@ -1,4 +1,4 @@
-<!ENTITY  lHeader                   "Navigator">
+<!ENTITY  pref.navigator.title      "Navigator">

 <!ENTITY  navRadio                  "Display on">
 <!ENTITY  navStartPageMenu.label    "Navigator Startup">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-policies.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-policies.dtd
@ -1,6 +1,5 @@

-<!ENTITY  lHeader             "Security Policies">
-<!ENTITY  rHeader             "(text here)">
+<!ENTITY  pref.policies.title "Security Policies">

 <!ENTITY  zoneIntro.label     "&brandShortName; allows you to create policies that determine what access certain websites have to various functionality, including aspects of scripting and Java.">

--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-popups.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-popups.dtd
@ -1,6 +1,6 @@
-<!ENTITY title                          "Popup Windows">
+<!ENTITY pref.popups.title              "Popup Windows">

-<!ENTITY popupBlocking.label            "Popup Windows">
+<!ENTITY pref.popups.caption            "Popup Windows">

 <!ENTITY popupDesc.label                "Specify how to handle popup windows that appear on top of or under the current Navigator window:">

--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
@ -1,9 +1,9 @@
 <!-- extracted from content/pref-proxies.xul -->

 <!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
-<!ENTITY  lHeader                       "Proxies">
+<!ENTITY  pref.proxies.title            "Proxies">
+<!ENTITY  pref.proxies.desc             "A Proxy is a network service that can filter and speed up your Internet connection.">
 <!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
-<!ENTITY  proxy.description             "A Proxy is a network service that can filter and speed up your Internet connection.">
 <!ENTITY  directTypeRadio.label         "Direct connection to the Internet">
 <!ENTITY  directTypeRadio.accesskey     "D">
 <!ENTITY  manualTypeRadio.label         "Manual proxy configuration:">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-scripts.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-scripts.dtd
@ -1,12 +1,12 @@
 <!-- extracted from content/pref-scripts.xul -->

 <!--LOCALIZATION NOTE : FILE The 'Scripts & Plug-ins' preferences dialog -->
-<!ENTITY lHeader "Scripts &amp; Plug-ins">
+<!ENTITY pref.scripts.title              "Scripts &amp; Plug-ins">

-<!--LOCALIZATION NOTE (enableJsCheck.label): 'JavaScript' should never be translated -->
-<!ENTITY navigator.label             "Navigator">
-<!ENTITY navigator.accesskey         "r">
+<!ENTITY navigator.label                 "Navigator">
+<!ENTITY navigator.accesskey             "r">

+<!--LOCALIZATION NOTE (enableJavaScript.label): 'JavaScript' should never be translated -->
 <!ENTITY enableJavaScript.label          "Enable JavaScript for">
 <!ENTITY allowScripts.label              "Allow scripts to:">
 <!ENTITY allowWindowOpen.label           "Open unrequested windows">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
@ -2,8 +2,7 @@

 <!-- LOCALIZATION NOTE : FILE The Search prefs dialog -->

-<!--LOCALIZATION NOTE (lHeader): Translate "Search" according to Netscape glossary -->
-<!ENTITY  lHeader                         "Internet Search">
+<!ENTITY  pref.search.title               "Internet Search">
 <!ENTITY  legendHeader                    "Default Search Engine">
 <!ENTITY  defaultSearchEngine.label       "Search using:">
 <!ENTITY  defaultSearchEngine.accesskey   "u">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-security.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-security.dtd
@ -36,6 +36,6 @@
   - ***** END LICENSE BLOCK ***** -->

 <!--LOCALIZATION NOTE : FILE 'Privacy and Security' prefs settings -->
-<!ENTITY lHeader                      "Privacy &amp; Security">
-<!ENTITY rContent1 "Privacy &amp; Security preferences determine how your browser fills in forms and passwords, how it works with cookies and images, and how it uses certificates and smart cards.">
-<!ENTITY rContent2 "If no subcategories are visible on the left under Privacy &amp; Security, double-click the category to expand the list.">
+<!ENTITY pref.security.title              "Privacy &amp; Security">
+<!ENTITY rContent1                        "Privacy &amp; Security preferences determine how your browser fills in forms and passwords, how it works with cookies and images, and how it uses certificates and smart cards.">
+<!ENTITY rContent2                        "If no subcategories are visible on the left under Privacy &amp; Security, double-click the category to expand the list.">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
@ -1,30 +1,29 @@
 <!-- extracted from content/pref-smart_browsing.xul -->

 <!--LOCALIZATION NOTE : FILE The SmartBrowsing prefs dialog -->
-<!ENTITY  lHeader                               "Smart Browsing">
+<!ENTITY pref.smartBrowsing.title              "Smart Browsing">

 <!--LOCALIZATION NOTE (internetKeywordsHeader.label): DONT_TRANSLATE -->
-<!ENTITY  internetKeywordsHeader.label          "Internet Keywords">
-<!ENTITY  internetKeywordsDescription.label     "&brandShortName; Internet Keywords enables fast access to services such as stock quotes, search and other information from the Location bar.">
-<!ENTITY  moreInformation.label                 "More Information...">
-<!ENTITY  moreInformation.accesskey             "M">
+<!ENTITY internetKeywordsHeader.label          "Internet Keywords">
+<!ENTITY internetKeywordsDescription.label     "&brandShortName; Internet Keywords enables fast access to services such as stock quotes, search and other information from the Location bar.">
+<!ENTITY moreInformation.label                 "More Information...">
+<!ENTITY moreInformation.accesskey             "M">
 <!--LOCALIZATION NOTE (enableKeyCheck.label): Do not translate 'Internet Keywords' -->
-<!ENTITY  keywordsEnabled.label                 "Enable Internet Keywords">
-<!ENTITY  keywordsEnabled.accesskey             "k">
+<!ENTITY keywordsEnabled.label                 "Enable Internet Keywords">
+<!ENTITY keywordsEnabled.accesskey             "k">

+<!ENTITY autoCompleteHeader.label              "Location Bar Autocomplete">
+<!ENTITY autoCompleteEnabled.label             "Automatically complete text typed into Location bar.">
+<!ENTITY autoCompleteEnabled.accesskey         "l">

-<!ENTITY  autoCompleteHeader.label          "Location Bar Autocomplete">
-<!ENTITY  autoCompleteEnabled.label                 "Automatically complete text typed into Location bar.">
-<!ENTITY  autoCompleteEnabled.accesskey             "l">
+<!ENTITY autoCompleteAdvanced.label            "Advanced...">
+<!ENTITY autoCompleteAdvanced.accesskey        "A">
+<!ENTITY autoCompleteAdvanced.title            "Autocomplete Preferences">
+<!ENTITY autoCompleteAutoFill.label            "Autocomplete best match as you type">
+<!ENTITY autoCompleteShowPopup.label           "Show list of matching results">
+<!ENTITY autoCompleteShowSearch.label          "Show internet search engine">
+<!ENTITY autoCompleteMatchOnlyTyped.label      "Match only websites you've typed previously">
+<!ENTITY autocompletePreview.label             "Preview">

-<!ENTITY  autoCompleteAdvanced.label             "Advanced...">
-<!ENTITY  autoCompleteAdvanced.accesskey         "A">
-<!ENTITY  autoCompleteAdvanced.title             "Autocomplete Preferences">
-<!ENTITY  autoCompleteAutoFill.label             "Autocomplete best match as you type">
-<!ENTITY  autoCompleteShowPopup.label            "Show list of matching results">
-<!ENTITY  autoCompleteShowSearch.label           "Show internet search engine">
-<!ENTITY  autoCompleteMatchOnlyTyped.label       "Match only websites you've typed previously">
-<!ENTITY  autocompletePreview.label              "Preview">
-
-<!ENTITY  domainGuessingHeader.label             "Domain Guessing">
-<!ENTITY  domainGuessingEnabled.label            "Automatically add &quot;www.&quot; and &quot;.com&quot; to the location if a web page isn't found.">
+<!ENTITY domainGuessingHeader.label            "Domain Guessing">
+<!ENTITY domainGuessingEnabled.label           "Automatically add &quot;www.&quot; and &quot;.com&quot; to the location if a web page isn't found.">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
@ -1,5 +1,5 @@
 <!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
-<!ENTITY lHeader                              "Software Installation">
+<!ENTITY pref.smartUpdate.title               "Software Installation">
 <!ENTITY smartTitle.label                     "Manage Software Installations and Updates">
 <!ENTITY enableSU.label                       "Enable software installation. (You will be prompted for each update.)">

--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd
@ -1,6 +1,6 @@

 <!--LOCALIZATION NOTE : FILE Theme management prefs -->
-<!ENTITY  lHeader                 "Themes">
+<!ENTITY  pref.themes.title       "Themes">

 <!ENTITY  skinIntro.label         "Selecting a new theme changes the look of buttons, dialog boxes, menus, toolbars, and other items. It does not change the way these items function.">
 <!ENTITY  installedThemes.label   "Theme to use:">
@ -8,8 +8,8 @@
 <!ENTITY  selectSkin.label        "Apply Theme">
 <!ENTITY  selectSkin.accesskey    "a">

-<!ENTITY  uninstallSkin.label        "Uninstall Theme">
-<!ENTITY  uninstallSkin.accesskey    "U">
+<!ENTITY  uninstallSkin.label     "Uninstall Theme">
+<!ENTITY  uninstallSkin.accesskey "U">

 <!ENTITY  general.label           "General">
 <!ENTITY  preview.label           "Preview Image">
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-winhooks.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-winhooks.dtd
@ -1,33 +1,33 @@
 <!-- LOCALIZATION NOTE : FILE "Windows integration" preferences -->

-<!ENTITY title.label "System">
+<!ENTITY pref.winHooks.title  "System">

 <!-- These entities are used on the "File Types" section of the dialog. -->
-<!ENTITY files.label     "File Types">
-<!ENTITY files.text      "Windows should use &brandShortName; to open these file types:">
-<!ENTITY html.label      "HTML documents">
-<!ENTITY jpeg.label      "JPEG images">
-<!ENTITY gif.label       "GIF images">
-<!ENTITY png.label       "PNG images">
-<!ENTITY mng.label       "MNG images">
-<!ENTITY xbm.label       "XBM images">
-<!ENTITY bmp.label       "BMP images">
-<!ENTITY ico.label       "ICO images">
-<!ENTITY xml.label       "XML documents">
-<!ENTITY xhtml.label     "XHTML documents">
-<!ENTITY xul.label       "XUL documents">
+<!ENTITY files.label          "File Types">
+<!ENTITY files.text           "Windows should use &brandShortName; to open these file types:">
+<!ENTITY html.label           "HTML documents">
+<!ENTITY jpeg.label           "JPEG images">
+<!ENTITY gif.label            "GIF images">
+<!ENTITY png.label            "PNG images">
+<!ENTITY mng.label            "MNG images">
+<!ENTITY xbm.label            "XBM images">
+<!ENTITY bmp.label            "BMP images">
+<!ENTITY ico.label            "ICO images">
+<!ENTITY xml.label            "XML documents">
+<!ENTITY xhtml.label          "XHTML documents">
+<!ENTITY xul.label            "XUL documents">

 <!-- These entities are used on the "Internet Shortcuts" section of the dialog. -->
-<!ENTITY shortcuts.label "Internet Shortcuts">
-<!ENTITY shortcuts.text  "Windows should use &brandShortName; to handle these protocols:">
-<!ENTITY http.label      "http: (Hypertext Transfer Protocol)">
-<!ENTITY https.label     "https: (Secure HTTP)">
-<!ENTITY ftp.label       "ftp: (File Transfer Protocol)">
+<!ENTITY shortcuts.label      "Internet Shortcuts">
+<!ENTITY shortcuts.text       "Windows should use &brandShortName; to handle these protocols:">
+<!ENTITY http.label           "http: (Hypertext Transfer Protocol)">
+<!ENTITY https.label          "https: (Secure HTTP)">
+<!ENTITY ftp.label            "ftp: (File Transfer Protocol)">
 <!--LOCALIZATION NOTE (chrome.label): Don't translate 'chrome' -->
-<!ENTITY chrome.label    "chrome: (Chrome Protocol)">
-<!ENTITY gopher.label    "gopher: (Gopher Protocol)">
+<!ENTITY chrome.label         "chrome: (Chrome Protocol)">
+<!ENTITY gopher.label         "gopher: (Gopher Protocol)">

 <!-- This entity is for the "show this dialog" checkbox. -->
-<!ENTITY showDialog.label "Alert me if other applications change these settings">
+<!ENTITY showDialog.label     "Alert me if other applications change these settings">
 <!ENTITY showDialog.accesskey "A">