From 605bb7b489b48ff6ebf1b002b10bcc7377496ce6 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Sun, 30 Apr 2000 02:47:45 +0000
Subject: [PATCH] prefwindow skinnability cleanup, string changes for verah

---
 .../resources/content/nsPrefWindow.js         |  2 +-
 .../resources/content/pref-advanced.xul       | 11 +++++++----
 .../resources/content/pref-appearance.xul     | 10 +++++++---
 .../resources/content/pref-applications.xul   | 18 +++++++++++-------
 .../resources/content/pref-cache.xul          |  5 +++--
 .../resources/content/pref-colors.xul         | 15 +++++----------
 .../resources/content/pref-composer.xul       |  3 +--
 .../resources/content/pref-debug.xul          |  3 +--
 .../resources/content/pref-editing.xul        |  3 +--
 .../resources/content/pref-fonts.js           | 19 +++++++++++++------
 .../resources/content/pref-fonts.xul          |  3 +--
 .../resources/content/pref-languages.xul      |  4 ++--
 .../resources/content/pref-mousewheel.xul     |  9 ++++-----
 .../resources/content/pref-navigator.xul      |  3 +--
 .../resources/content/pref-policies.xul       |  3 +--
 .../resources/content/pref-proxies.xul        |  4 ++--
 .../resources/content/pref-search.xul         |  3 +--
 .../resources/content/pref-smart_browsing.xul |  3 +--
 .../resources/content/pref-smartupdate.xul    |  6 +++---
 .../resources/content/pref-themes.xul         |  1 -
 .../resources/content/pref-wallet.xul         |  3 +--
 .../prefwindow/resources/content/pref.xul     |  3 +--
 .../prefwindow/resources/content/preftree.xul |  2 +-
 .../resources/locale/en-US/pref-advanced.dtd  |  9 ++++++---
 .../locale/en-US/pref-appearance.dtd          | 11 +++++------
 .../locale/en-US/pref-applications.dtd        |  8 ++++----
 .../resources/locale/en-US/pref-cache.dtd     |  8 ++++----
 .../resources/locale/en-US/pref-colors.dtd    | 11 +++++------
 .../resources/locale/en-US/pref-composer.dtd  |  7 ++-----
 .../resources/locale/en-US/pref-fonts.dtd     |  9 ++++-----
 .../resources/locale/en-US/pref-languages.dtd |  4 ++--
 .../locale/en-US/pref-mousewheel.dtd          |  2 +-
 .../resources/locale/en-US/pref-navigator.dtd |  9 ++++-----
 .../resources/locale/en-US/pref-proxies.dtd   |  4 ++--
 .../resources/locale/en-US/pref-search.dtd    |  7 +++----
 .../locale/en-US/pref-smart_browsing.dtd      |  5 ++---
 .../locale/en-US/pref-smartupdate.dtd         |  7 ++++---
 .../resources/locale/en-US/pref-wallet.dtd    | 18 +++++++++---------
 .../locale/en-US/prefutilities.properties     |  1 +
 39 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/xpfe/components/prefwindow/resources/content/nsPrefWindow.js b/xpfe/components/prefwindow/resources/content/nsPrefWindow.js
index 40aef069a4f5..caf848ca7925 100644
--- a/xpfe/components/prefwindow/resources/content/nsPrefWindow.js
+++ b/xpfe/components/prefwindow/resources/content/nsPrefWindow.js
@@ -309,7 +309,7 @@ nsPrefWindow.prototype =
           for( var i = 0; i < panelChildren.childNodes.length; i++ )
             {
               var currentItem = panelChildren.childNodes[i];
-              if( currentItem.id != aComponentName )
+              if( currentItem.id != aComponentName && currentItem.id != "appearance" )
                 currentItem.removeAttribute( "open" );
             }
           var openItem = document.getElementById( aComponentName );
diff --git a/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 5675e4ccac75..26052f3c0b1a 100644
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -20,7 +20,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd" >
@@ -42,7 +41,7 @@
   
   function displayImageDialog()
   {
-    window.openDialog("chrome://pref/content/pref-imageblocking.xul", "", "chrome,resizable=no");
+    window.openDialog("chrome://communicator/content/pref/pref-imageblocking.xul", "", "chrome,resizable=no");
   }
 
   function updateImageFields( aInteger, aBoolean )
@@ -62,10 +61,10 @@
   ]]>
   </script>        
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical" id="advancedSettings">
-	
+	  <title><text value="&advancedTitle.label;"/></title>
     <box autostretch="never">
       <checkbox id="advancedAlwaysLoadImages" value="&autoLoadImgCheck.label;" accesskey="&autoLoadImgCheck.accesskey;"
                 pref="true" preftype="bool" prefstring="advanced.always_load_images"
@@ -94,6 +93,10 @@
     <checkbox id="advancedMailFTP" value="&sendAddFtpCheck.label;" accesskey="&sendAddFtpCheck.accesskey;"
               pref="true" preftype="bool" prefstring="advanced.mailftp"
               prefattribute="checked"/>
+
+    <separator/>
+    
+    <html>&description.label;</html>
 	</titledbox>
 
   <!-- hidden elements to contain image blocking prefs -->
diff --git a/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index 902a328acb2c..74e4a3ff54e6 100644
--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -23,10 +23,14 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-appearance.dtd" >
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefAppearanceDTD SYSTEM "chrome://communicator/locale/pref/pref-appearance.dtd" >
+%prefAppearanceDTD;
+]>
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
     		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
@@ -41,7 +45,7 @@
   ]]>
   </script>
           
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox id="generalStartupPreferences" orient="vertical" autostretch="never">
     <title><text value="&onStartLegend.label;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-applications.xul b/xpfe/components/prefwindow/resources/content/pref-applications.xul
index 77ae659e520a..486e92484d0f 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >
@@ -41,10 +40,13 @@
               from the list as appropriate to pass to the Data Manager
       -->              
 
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox>
     <title><text value="&descript;"/></title>
+    
+    <box orient="vertical">
+      <text class="label" value="&fileTypes.label;"/>
       <tree id="appTree" class="inset" flex="1">
         <treecol/>
         <treechildren>
@@ -55,11 +57,13 @@
           </treeitem>
         </treechildren>
       </tree>
-	  	<box orient="vertical" halign="top">
-  	  	<button class="dialog push" id="newTypeButton" value="&newTypeButton.label;" accesskey="&newTypeButton.accesskey;" />
- 	  		<button class="dialog push" id="editButton" value="&editButton.label;" accesskey="&editButton.accesskey;" />
-  	  	<button class="dialog push" id="removeButton" value="&removeButton.label;" accesskey="&removeButton.accesskey;" />
-   	  </box>
+    </box>
+    
+    <box orient="vertical" halign="top">
+	  	<button class="dialog push" id="newTypeButton" value="&newTypeButton.label;" accesskey="&newTypeButton.accesskey;" />
+  		<button class="dialog push" id="editButton" value="&editButton.label;" accesskey="&editButton.accesskey;" />
+	  	<button class="dialog push" id="removeButton" value="&removeButton.label;" accesskey="&removeButton.accesskey;" />
+ 	  </box>
   </titledbox>
     
   <titledbox orient="vertical">
diff --git a/xpfe/components/prefwindow/resources/content/pref-cache.xul b/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 16b8a5590f1d..93d00a1d3245 100644
--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
@@ -41,9 +40,11 @@
   <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
   <script language="javascript" src="chrome://communicator/content/pref/pref-cache.js"></script>
 
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
+    <title><text value="&cacheTitle.label;"/></title>
+    
     <html>&cachePara;</html>
 
     <separator/>
diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index 455a11866845..838b6ea326d9 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd" >
@@ -42,7 +41,7 @@
   
   <script language="JavaScript" src="chrome://communicator/content/pref/pref-colors.js"></script>
 
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <box>
 		<titledbox orient="vertical" flex="1">
@@ -57,8 +56,7 @@
             <colorpicker allowevents="true" id="foregroundColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'foregroundtext', false);"/>
           </menupopup>
         </menu>
-        <textfield collapsed="true" id="foregroundText" pref="true" preftype="color"
-                   prefstring="browser.foreground_color" prefattribute="value"/>
+        <data id="foregroundText" pref="true" preftype="color" prefstring="browser.foreground_color" prefattribute="value" wsm_attributes="value"/>
       </box>
       <box>
         <text class="label" value="&backgroundColor.label;" accesskey="&backgroundColor.label;" for="backgroundmenu"/>
@@ -70,8 +68,7 @@
             <colorpicker allowevents="true" id="backgroundColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'background', false);"/>
           </menupopup>
         </menu>
-        <textfield collapsed="true" id="background" pref="true" preftype="color"
-                   prefstring="browser.background_color" prefattribute="value"/>
+        <data id="background" pref="true" preftype="color" prefstring="browser.background_color" prefattribute="value" wsm_attributes="value"/>
       </box>
       <checkbox id="browserUseWindowsColors" value="&useWindowsColors.label;" accesskey="&useWindowsColors.accesskey;"
                 pref="true" preftype="bool" prefstring="browser.wfe.use_windows_colors" prefattribute="checked"/>
@@ -89,8 +86,7 @@
             <colorpicker allowevents="true" id="unvisitedLinksColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'background', false);"/>
           </menupopup>
         </menu>
-        <textfield collapsed="true" id="unvisitedLinks" pref="true" preftype="string"
-                   prefstring="browser.anchor_color" prefattribute="value"/>
+        <data id="unvisitedLinks" pref="true" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
       </box>
     	<box>
         <text class="label" value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" for="visitedlinkmenu"/>
@@ -102,8 +98,7 @@
             <colorpicker allowevents="true" id="visitedLinksColorpicker" palettename="standard" onclick="setColorWell(this.parentNode.parentNode, 'background', false);"/>
           </menupopup>
         </menu>
-        <textfield collapsed="true" id="visitedLinks" pref="true" preftype="string"
-                   prefstring="browser.visited_color" prefattribute="value"/>
+        <data id="visitedLinks" pref="true" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
       </box>
   		<checkbox id="browserUnderlineAnchors" value="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
                 pref="true" preftype="bool" prefstring="browser.underline_anchors" prefattribute="checked"/>
diff --git a/xpfe/components/prefwindow/resources/content/pref-composer.xul b/xpfe/components/prefwindow/resources/content/pref-composer.xul
index 58846e2bb8e3..ddb4f87d1f60 100644
--- a/xpfe/components/prefwindow/resources/content/pref-composer.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-composer.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-composer.dtd" >
@@ -39,7 +38,7 @@
   ]]>
   </script>        
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical" autostretch="never">
     <title><text value="&tableEditing.label;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-debug.xul b/xpfe/components/prefwindow/resources/content/pref-debug.xul
index 8cef0d4811b7..47dea9ae3a32 100644
--- a/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug.dtd" >
@@ -42,7 +41,7 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
   
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
diff --git a/xpfe/components/prefwindow/resources/content/pref-editing.xul b/xpfe/components/prefwindow/resources/content/pref-editing.xul
index 9b3bf0d277ff..271c79ecf907 100644
--- a/xpfe/components/prefwindow/resources/content/pref-editing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-editing.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-editing.dtd">
@@ -43,7 +42,7 @@
   <script language="JavaScript" src="chrome://global/content/strres.js"></script>
   <script language="JavaScript" src="chrome://communicator/content/pref/prefutilities.js"></script>
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
     <title><text value="&authorName.label;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.js b/xpfe/components/prefwindow/resources/content/pref-fonts.js
index 06350cd92126..b740767c8ddd 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.js
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.js
@@ -16,6 +16,7 @@ var fontTypes   = ["serif","sans-serif", /*"cursive", "fantasy",*/"monospace"];
 var variableSize, fixedSize, languageList;
 var languageData = [];
 var currentLanguage;
+var bundle;
 
 // manual data retrieval function for PrefWindow
 function GetFields()
@@ -96,6 +97,8 @@ function Startup()
     variableSize = document.getElementById( "sizeVar" );
     fixedSize    = document.getElementById( "sizeMono" );
     languageList = document.getElementById( "selectLangs" );
+
+    bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
   
     // register our ok callback function
     parent.hPrefWindow.registerOKCallbackFunc( saveFontPrefs );
@@ -138,8 +141,16 @@ listElement.prototype =
           for( var i = 0; i < faces.length; i++ )
             {
               var itemNode = document.createElement( "menuitem" );
-              itemNode.setAttribute( "data", faces[i] );
-              itemNode.setAttribute( "value", faces[i] );
+              if( faces[i] == "" )
+                {
+                  itemNode.setAttribute( "data", faces[i] );
+                  itemNode.setAttribute( "value", bundle.GetStringFromName("nofontsforlang") );
+                }
+              else
+                {
+                  itemNode.setAttribute( "data", faces[i] );
+                  itemNode.setAttribute( "value", faces[i] );
+                }
               popupNode.appendChild( itemNode );
             }
           this.listElement.appendChild( popupNode );
@@ -294,7 +305,3 @@ function selectLanguage()
     currentLanguage = languageList.data;
   }
 
-
-
-
-
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index 56b20d7b5c93..691b88b09b1c 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
@@ -35,7 +34,7 @@
 
   <script language="javascript" src="chrome://communicator/content/pref/pref-fonts.js"></script>
 
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
   
 
   <titledbox orient="vertical">
diff --git a/xpfe/components/prefwindow/resources/content/pref-languages.xul b/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 035caeb4ffd7..db2c0dd39f38 100644
--- a/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
@@ -31,9 +30,10 @@
         align="vertical" title="window.title"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-languages.xul');">
 		
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
+    <title><text value="&langtitle.label;"/></title>
     <html>&prefLangDecript;</html>
   
     <separator/>
diff --git a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index c58c34acdaf0..fd642109399b 100644
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -24,7 +24,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
   
 
@@ -73,9 +72,11 @@
   ]]>
   </script>
     
-  <box class="box-smallheader" title="&title.label;" description="&info.label;"/>
+  <box class="box-smallheader" title="&title.label;"/>
 
   <titledbox orient="vertical">
+    <title><text value="&mouseWheelTitle.label;"/></title>
+  
     <box>
       <text class="label" value="&mouseWheelPanel.label;" accesskey="&mouseWheelPanel.accesskey;" for="mouseWheelMode"/>
       <menulist id="mouseWheelMode" oncommand="switchPage(this);">
@@ -88,9 +89,7 @@
       </menulist>
     </box>
   
-    <separator class="groove"/>
-      
-    <deck id="modifierDeck" flex="1">
+    <deck id="modifierDeck" flex="1" class="indent">
       
       <!-- no key modifiers -->
       <radiogroup id="mousewheelWithNoKeyAction" orient="vertical" autostretch="never"
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index 142738b0a122..4f2cd043f050 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >
@@ -41,7 +40,7 @@
   ]]>
   </script>
   
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <!-- navigator starts with -->  
   <titledbox>
diff --git a/xpfe/components/prefwindow/resources/content/pref-policies.xul b/xpfe/components/prefwindow/resources/content/pref-policies.xul
index 9a1770c2c8f7..d7208da06cf3 100644
--- a/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-policies.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-policies.dtd">
@@ -19,7 +18,7 @@
   </script>
 
 
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
   
diff --git a/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index 27406592b70e..a93e73453463 100644
--- a/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
@@ -41,9 +40,10 @@
   <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
   <script language="JavaScript" src="chrome://communicator/content/pref/pref-proxies.js"></script>
   
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
+    <title><text value="&proxyTitle.label;"/></title>
     <html>&networkHeader.label;</html>
 
     <radiogroup id="networkProxyType" orient="vertical"
diff --git a/xpfe/components/prefwindow/resources/content/pref-search.xul b/xpfe/components/prefwindow/resources/content/pref-search.xul
index 6a4546eb826f..3d8fb0c89612 100755
--- a/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-search.xul
@@ -21,7 +21,6 @@
    Contributor(s): Robert John Churchill (rjc@netscape.com)
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
@@ -37,7 +36,7 @@
   ]]>
   </script>        
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox>
     <title><text value="&legendHeader;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index d1e8d77910af..496800dc2cfd 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -149,7 +148,7 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
 	  <title><text value="&lHeader;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index ebf06c23eac8..618b0fb70665 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
@@ -19,9 +18,10 @@
   </script>
         
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
     
-  <titledbox orient="vertical">
+  <titledbox orient="vertical" autostretch="never">
+    <title><text value="&smartTitle.label;"/></title>
     <checkbox id="XPInstallEnabled" value="&enableSU.label;" accesskey="&enableSU.accesskey;"
               pref="true" preftype="bool" prefstring="xpinstall.enabled"
               prefattribute="checked"/>
diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.xul b/xpfe/components/prefwindow/resources/content/pref-themes.xul
index e84f46f75130..d54494d4c26b 100644
--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -22,7 +22,6 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-themes.dtd" >
diff --git a/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/xpfe/components/prefwindow/resources/content/pref-wallet.xul
index aa090ae2d8a4..36391c402fa3 100644
--- a/xpfe/components/prefwindow/resources/content/pref-wallet.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-wallet.xul
@@ -20,7 +20,6 @@
    Contributor(s): 
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -63,7 +62,7 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
     <title><text value="&walletHeader.label;"/></title>
diff --git a/xpfe/components/prefwindow/resources/content/pref.xul b/xpfe/components/prefwindow/resources/content/pref.xul
index 2023c1626167..ef9c047deb81 100644
--- a/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/xpfe/components/prefwindow/resources/content/pref.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?> 
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/pref/preftree.xul"?>
@@ -28,7 +27,7 @@
     <!-- tree sidebar -->
     <tree class="inset" id="prefsTree"/>      
 
-    <html:iframe id="panelFrame" name="panelFrame" style="width:0px" flex="1"/>
+    <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="1"/>
     <script language="JavaScript">
     <![CDATA[
       if( window.arguments && window.arguments[0] ) {
diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul
index 3224b28ed08b..92908e0537ca 100644
--- a/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -34,7 +34,7 @@
 
   <treehead name="tree">
     <treerow>
-      <treecell url="__header" value="&categoryHeader;"/>
+      <treecell class="treecell-header outset" url="__header" value="&categoryHeader;"/>
     </treerow>
   </treehead>
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
index 3ac54ec9f443..974f982d671f 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
@@ -3,7 +3,8 @@
 <!ENTITY window.title                 "Advanced">
 
 <!ENTITY lHeader                      "Advanced">
-<!ENTITY rHeader                      "Changing preferences that affect the entire product">
+
+<!ENTITY advancedTitle.label          "Enable features that help interpret web pages">
 
 <!ENTITY autoLoadImgCheck.label       "Automatically load images"> 
 <!ENTITY autoLoadImgCheck.accesskey   "i">
@@ -13,13 +14,13 @@
 <!ENTITY enbJavaCheck.accesskey       "j">
 
 <!--LOCALIZATION NOTE (enbJsCheck.label): 'JavaScript' should never be translated -->
-<!ENTITY enbJsCheck.label             "Enable JavaScript in Navigator">
+<!ENTITY enbJsCheck.label             "Enable JavaScript for Navigator">
 <!ENTITY enbJsCheck.accesskey         "r">
 
 <!ENTITY enbJsCheckMailNews.label     "Enable JavaScript for Mail and News">
 <!ENTITY enbJsCheckMailNews.accesskey "m">
 
-<!ENTITY enbCssCheck.label            "Enable style sheets">
+<!ENTITY enbCssCheck.label            "Enable style sheets for web pages">
 <!ENTITY enbCssCheck.accesskey        "s">
 
 <!ENTITY sendAddFtpCheck.label        "Send email address as anonymous FTP password">
@@ -28,6 +29,8 @@
 <!ENTITY imageBlocking.label          "Image Blocking...">
 <!ENTITY imageBlocking.accesskey      "b">
 
+<!ENTITY description.label            "Checked items are automatically enabled when you visit web pages that use them. If you uncheck an item, pages may load faster but some functionality will be limited.">
+
 <!-- cookies -->
 
 <!ENTITY cookies                        "Cookies">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
index 0197574b0a9b..ed78e1e15b4b 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
@@ -3,14 +3,13 @@
 <!--LOCALIZATION NOTE : FILE The Appearance prefs dialog.  -->
 <!ENTITY window.title "Appearance">
 <!ENTITY lHeader "Appearance">
-<!ENTITY rHeader "Change the appearance of the display">
-<!ENTITY onStartLegend.label "On startup, launch">
+<!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">
 <!--LOCALIZATION NOTE (mesCheck.label): DONT_TRANSLATE -->
-<!ENTITY mesCheck.label "Messenger">
+<!ENTITY mesCheck.label "&vendorShortName; Mail">
 <!ENTITY mesCheck.accesskey "m">
 <!--LOCALIZATION NOTE (compCheck.label): DONT_TRANSLATE -->
 <!ENTITY compCheck.label "Composer">
@@ -18,9 +17,9 @@
 <!ENTITY calCheck.label "Calendar">
 <!ENTITY calCheck.accesskey "a">
 <!ENTITY showToolsLegend.label "Show toolbars as">
-<!ENTITY picsNtextRadio.label "Pictures and Text">
+<!ENTITY picsNtextRadio.label "Pictures and text">
 <!ENTITY picsNtextRadio.accesskey "p">
-<!ENTITY picsOnlyRadio.label "Pictures Only">
+<!ENTITY picsOnlyRadio.label "Pictures only">
 <!ENTITY picsOnlyRadio.accesskey "o">
-<!ENTITY textonlyRadio.label "Text Only">
+<!ENTITY textonlyRadio.label "Text only">
 <!ENTITY textonlyRadio.accesskey "t">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
index 9ff56a32407d..d801d27b58a4 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-applications.dtd
@@ -3,8 +3,8 @@
 <!--LOCALIZATION NOTE : FILE The Applications prefs dialog -->
 <!ENTITY window.title                   "Advanced">
 <!ENTITY lHeader                        "Applications">
-<!ENTITY rHeader                        "Specify helper applications for different file types">
-<!ENTITY descript                       "Description">
+<!ENTITY descript                       "Specifiy which application should handle each file type">
+<!ENTITY fileTypes.label                "File types:">
 <!ENTITY aimLaunchSelect.label          "AOL Instant Messenger Launch">
 <!ENTITY newTypeButton.label            "New Type...">
 <!ENTITY newTypeButton.accesskey        "n">
@@ -15,5 +15,5 @@
 <!ENTITY file                           "File type details">
 <!ENTITY exten                          "Extension:">
 <!--LOCALIZATION NOTE (mimeType): 'MIME' should not be translated -->
-<!ENTITY mimeType                       "MIME Type:">
-<!ENTITY handle                         "Handled By:">
+<!ENTITY mimeType                       "MIME type:">
+<!ENTITY handle                         "Handled by:">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
index f5b7c4f7248e..a2a477cac341 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-cache.dtd
@@ -3,8 +3,8 @@
 <!--LOCALIZATION NOTE : FILE Cache prefs dialog -->
 <!ENTITY  title.label                   "Cache">
 <!ENTITY  lHeader                       "Cache">
-<!ENTITY  rHeader                       "Designate the size of the cache">
-<!ENTITY  cachePara                     "The cache is used to keep local copies of frequently accessed documents and thus reduce time connected to the network. The Reload button will always compare the cache document to the network and show the most recent one.">
+<!ENTITY  cacheTitle.label              "Set Cache size">
+<!ENTITY  cachePara                     "The cache keeps copies of frequently visited web pages on your hard disk. This reduces the amount of time you are connected to the Internet. (Clicking Reload always shows you the latest version of a page.)">
 <!ENTITY  memCache.label                "Memory Cache:">
 <!ENTITY  memCache.accesskey            "m">
 <!ENTITY  diskCache.label               "Disk Cache:">
@@ -16,12 +16,12 @@
 <!ENTITY  clearMemCache.accesskey       "c">
 <!ENTITY  clearDiskCache.label          "Clear Disk Cache">
 <!ENTITY  clearDiskCache.accesskey      "l">
-<!ENTITY  docCache                      "Document in cache is compared to document on network:">
+<!ENTITY  docCache                      "Compare the page in the cache to the page on the network">
 <!ENTITY  chooseFolder.label            "Choose Folder...">
 <!ENTITY  chooseFolder.accesskey        "f">
 <!ENTITY  oncePsessionRadio.label       "Once per session">
 <!ENTITY  oncePsessionRadio.accesskey   "o">
-<!ENTITY  everyTimeRadio.label          "Every time">
+<!ENTITY  everyTimeRadio.label          "Every time I view the page">
 <!ENTITY  everyTimeRadio.accesskey      "e">
 <!ENTITY  neverRadio.label              "Never">
 <!ENTITY  neverRadio.accesskey          "n">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
index bfb67f1a9e01..fad3441a7915 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd
@@ -3,8 +3,7 @@
 <!-- LOCALIZATION NOTE : FILE Color management prefs -->
 <!ENTITY  window.title                    "Colors">
 <!ENTITY  lHeader                         "Colors">
-<!ENTITY  rHeader                         "Change the default webpage display colors">
-<!ENTITY  color                           "Colors">
+<!ENTITY  color                           "Text and background">
 <!ENTITY  textColor.label                 "Text:">
 <!ENTITY  textColor.accesskey             "t">
 <!ENTITY  backgroundColor.label           "Background:">
@@ -14,16 +13,16 @@
 
 <!ENTITY  underlineLinks.label            "Underline links">
 <!ENTITY  underlineLinks.accesskey        "u">
-<!ENTITY  links                           "Links">
+<!ENTITY  links                           "Link colors">
 <!ENTITY  linkColor.label                 "Unvisited Links:">
 <!ENTITY  linkColor.accesskey             "l">
 <!ENTITY  visitedLinkColor.label          "Visited Links:">
 <!ENTITY  visitedLinkColor.accesskey      "v">
 <!-- LOCALIZATION NOTE (someProvColors): This is the start of a sentence and will be followed by the following radio buttons. -->
-<!ENTITY  someProvColors                  "When a webpage provides its own colors and background:">
+<!ENTITY  someProvColors                  "When a web page provides its own colors and background">
 <!-- LOCALIZATION NOTE (alwaysUseDocColors.label): This is option one, and it appends to 'someProvColors' above. -->
-<!ENTITY  alwaysUseDocumentColors.label   "always use the colors and background supplied by the webpage">
+<!ENTITY  alwaysUseDocumentColors.label   "always use the colors and background specified by the web page">
 <!ENTITY  alwaysUseDocumentColors.accesskey "a">
 <!-- LOCALIZATION NOTE (ignoreDocColors.label): This is option two, and it appends to 'someProvColors' above.  -->
-<!ENTITY  useMyColors.label               "use my chosen colors, ignoring the colors provided">
+<!ENTITY  useMyColors.label               "use my chosen colors, ignoring the colors specified">
 <!ENTITY  useMyColors.accesskey           "i">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
index fbc495411ce7..5c5afee54433 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd
@@ -5,7 +5,7 @@
 <!--LOCALIZATION NOTE (title.label): DONT_TRANSLATE -->
 <!ENTITY  title.label               "Composer">
 <!ENTITY  lHeader                   "Composer">
-<!ENTITY  rHeader                   "Settings for authoring of new web pages">
+<!ENTITY  rHeader                   "Settings for authoring of new Web pages">
 
 <!ENTITY  tableEditing.label                    "Table Editing">
 
@@ -16,7 +16,4 @@
 <!ENTITY  deleteCell.label                      "delete cell (content and structure)">
 <!ENTITY  deleteCell.accesskey                  "s">
 <!ENTITY  deleteContent.label                   "delete only cell content">
-<!ENTITY  deleteContent.accesskey               "c">
-
-<!ENTITY  AutoSaveCheck             "Automatically save every">
-<!ENTITY  minText                   "minutes">
+<!ENTITY  deleteContent.accesskey               "c">
\ No newline at end of file
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
index d1ad8423a1ff..6f23bfecfb3d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
@@ -3,8 +3,7 @@
 <!-- LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
 <!ENTITY  window.title                            "Fonts">
 <!ENTITY  lHeader                                 "Fonts">
-<!ENTITY  rHeader                                 "Font settings for webpage display">
-<!ENTITY  displayFonts                            "Default Fonts">
+<!ENTITY  displayFonts                            "Default fonts for displaying web pages">
 
 <!ENTITY  language.label                          "Fonts for:">
 <!ENTITY  language.accesskey                      "o">
@@ -52,7 +51,7 @@
 <!ENTITY  newLanguages.label                      "New languages can be configured using the Languages Panel.">
 
 
-<!ENTITY  useDocumentFonts.label                  "Always use my font settings, overriding what webpages specify">
+<!ENTITY  useDocumentFonts.label                  "Always use my font settings, overriding what web pages specify">
 <!ENTITY  useDocumentFonts.accesskey              "u">
 
 <!-- leaving this stuff in for now -->
@@ -68,8 +67,8 @@
 <!ENTITY  useDocFontDynamic.accesskey             "a">
 
 <!-- font scaling -->
-<!ENTITY  fontScaling                             "Font Scaling">
-<!ENTITY  fontScalingIntro                        "Choose a resolution at which fonts will be displayed. A larger value can improve text visibility on some computers.">
+<!ENTITY  fontScaling                             "Font resolution">
+<!ENTITY  fontScalingIntro                        "Choose a font resolution. A larger value can improve text readability on some computers.">
 <!ENTITY  defaultScaling                          "96">
 <!ENTITY  fontScalingExample                      "dpi. (e.g. 96dpi)">
 <!ENTITY  resolution.label                        "Font display resolution:">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
index d7d3eab34d59..31817fb73e5d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd
@@ -3,8 +3,8 @@
 <!-- LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
 <!ENTITY  window.title                  "Languages">
 <!ENTITY  lHeader                       "Languages">
-<!ENTITY  rHeader                       "Languages in which webpages are displayed">
-<!ENTITY  prefLangDecript               "Choose in order of preference the language(s) in which you prefer to view web pages. Web pages are sometimes available in several languages.  Navigator presents pages in the available language you most prefer.">
+<!ENTITY  langtitle.label               "Languages for web pages">
+<!ENTITY  prefLangDecript               "Web pages are sometimes available in more than one language. Choose languages for displaying web pages, in order of preference.">
 <!-- LOCALIZATION NOTE (engOption.label): DONT_TRANSLATE -->
 <!ENTITY engOrder.label                 "1">
 <!ENTITY engOption.label                "English">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
index a099821e6a78..4413fa758101 100644
--- 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,7 @@
 <!-- LOCALIZATION NOTE : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->
 
 <!ENTITY title.label                  "Mouse Wheel">
-<!ENTITY info.label                   "Mouse Wheel Configuration">
+<!ENTITY mouseWheelTitle.label        "Mouse wheel configuration">
 <!ENTITY mouseWheelPanel.label        "When ">
 <!ENTITY mouseWheelPanel.accesskey    "w">
 <!ENTITY usingJustTheWheel.label      "using just the mouse wheel">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
index 0e3a1a44d1a3..95bbdb3f251d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd
@@ -1,9 +1,8 @@
 
 <!ENTITY  title.label               "Navigator">
 <!ENTITY  lHeader                   "Navigator">
-<!ENTITY  rHeader                   "Homepage and history settings">
 
-<!ENTITY  navRadio                  "Navigator starts with">
+<!ENTITY  navRadio                  "When Navigator starts up, display">
 <!ENTITY  blankPageRadio.label      "Blank page">
 <!ENTITY  blankPageRadio.accesskey  "n">
 <!ENTITY  homePageRadio.label       "Home page">
@@ -12,7 +11,7 @@
 <!ENTITY  lastPageRadio.accesskey   "l">
 
 <!ENTITY  header2.label             "Home page">
-<!ENTITY  homePageIntro.label       "Clicking the Home button will take you to this page.">
+<!ENTITY  homePageIntro.label       "Clicking the Home button takes you to this page.">
 <!ENTITY  location.label            "Location:">
 <!ENTITY  location.accesskey        "a">
 <!ENTITY  useCurrent.label          "Use Current Page">
@@ -28,8 +27,8 @@
 <!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.">
+<!ENTITY  locationBarHistory.label  "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">
   
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
index 53d65959e6a7..8e7f54999341 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd
@@ -3,8 +3,8 @@
 <!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
 <!ENTITY  title.label                   "Proxies Panel">
 <!ENTITY  lHeader                       "Proxies">
-<!ENTITY  rHeader                       "Configure proxies to access the Internet">
-<!ENTITY  networkHeader.label           "A network proxy is used to provide additional security between your computer and the Internet (usually along with a firewall) and/or to increase performance between networks by reducing redundant traffic via caching.">
+<!ENTITY  proxyTitle.label              "Configure proxies to access the Internet">
+<!ENTITY  networkHeader.label           "A network proxy provides additional security between your computer and the Intenet. Proxies can also increase performance between multiple networks, by using caches to reduce traffic.">
 <!ENTITY  directTypeRadio.label         "Direct connection to the Internet">
 <!ENTITY  directTypeRadio.accesskey     "d">
 <!ENTITY  manualTypeRadio.label         "Manual proxy configuration">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
index d0ed97fb4415..faeffe44e98b 100755
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-search.dtd
@@ -6,16 +6,15 @@
 
 <!--L OCALIZATION NOTE (lHeader): Translate "Search" according to Netscape glossary -->
 <!ENTITY  lHeader                         "Search">
-<!ENTITY  rHeader                         "Configure Search">
-<!ENTITY  legendHeader                    "Default Search Engine">
+<!ENTITY  legendHeader                    "Default search engine">
 <!ENTITY  defaultSearchEngine.label       "Search using:">
 <!ENTITY  defaultSearchEngine.accesskey   "u">
 
-<!ENTITY  openSidebarSearchPanel.label    "Open the 'Internet Search' My Sidebar panel when results are available">
+<!ENTITY  openSidebarSearchPanel.label    "Open the Internet Search My Sidebar tab when search results are available">
 <!ENTITY  openSidebarSearchPanel.accesskey "o">
 
 <!-- LOCALIZATION NOTE (defaultengine.label): Keep parenthesis so it sorts to the first position in the list -->
 <!ENTITY  defaultengine.label             "Netscape Search">
-<!ENTITY  searchResults.label             "Search Results">
+<!ENTITY  searchResults.label             "Search results">
 
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
index 10bbe85d4ae0..40decc992f31 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
@@ -6,10 +6,9 @@
 
 <!--LOCALIZATION NOTE (lHeader): Translate "What's Related" according to Netscape glossary -->
 <!ENTITY  lHeader                               "What's Related">
-<!ENTITY  rHeader                               "Configure browsing aids">
 
 <!--LOCALIZATION NOTE (enableRelatedRadio.label): Translate "What's Related" according to Netscape glossary -->
-<!ENTITY  whatsRelatedDescription.label         "What's Related is a My Sidebar panel that lists sites with similar content to the one you are visiting.">
+<!ENTITY  whatsRelatedDescription.label         "What's Related is a My Sidebar tab that lists sites similar to the one you are visiting.">
 <!ENTITY  whatsRelatedEnabled.label             "Enable What's Related">
 <!ENTITY  whatsRelatedEnabled.accesskey         "e">
 <!--LOCALIZATION NOTE (autoDecp.label): Translate "What's Related" according to Netscape glossary -->
@@ -25,7 +24,7 @@
 
 <!--LOCALIZATION NOTE (internetKeywordsHeader.label): DONT_TRANSLATE -->
 <!ENTITY  internetKeywordsHeader.label          "Internet Keywords">
-<!ENTITY  internetKeywordsDescription.label     "&brandShortName; Intenet Keywords give you fast access to services such as stock quotes, search and other information from the URL bar.">
+<!ENTITY  internetKeywordsDescription.label     "&brandShortName; Intenet Keywords give you 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' -->
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
index 0a5d33c01ce0..b0cc9d8b538b 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd
@@ -1,10 +1,11 @@
 <!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
 <!ENTITY title.label                          "Software Installation">
 <!ENTITY lHeader                              "Software Installation">
-<!ENTITY rHeader                              "Manage Installed Software">
-<!ENTITY enableSU.label                       "Enable software installations">
+<!ENTITY smartTitle.label                     "Manage software installations and updates">
+<!ENTITY enableSU.label                       "Automatically install new and updated software">
+
 <!ENTITY enableSU.accesskey                   "e">
-<!ENTITY enableNotification.label             "Enable notification of new and updated software">
+<!ENTITY enableNotification.label             "Notify me when new and updated software is available">
 <!ENTITY enableNotification.accesskey         "n">
 <!ENTITY requireConfirmation.label            "Require manual confirmation of each install">
 <!--LOCALIZATION NOTE (selectUninstall.label): A large list box appears below this label -->
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd
index 65d3247993a0..273fe19ae7f4 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd
@@ -1,23 +1,23 @@
-<!ENTITY  window.title                "SmartFill">
-<!ENTITY  lHeader                     "SmartFill">
+<!ENTITY  window.title                "Forms and Passwords">
+<!ENTITY  lHeader                     "Forms and Passwords">
 <!ENTITY  rHeader                     "Manage personal information and passwords">
 
-<!ENTITY  walletHeader.label          "&brandShortName; SmartFill">
-<!ENTITY  walletDescription.label     "&brandShortName; SmartFill can remember information about you so that filling out forms on webpages is faster.">
-<!ENTITY  walletServer.label          "Server for SmartFill tables:">
+<!ENTITY  walletHeader.label          "Forms Manager">
+<!ENTITY  walletDescription.label     "Forms Manager can remember information about you so that filling out forms on webpages is faster.">
+<!ENTITY  walletServer.label          "Server for Forms Manager tables:">
 <!ENTITY  walletServer.accesskey      "s">
 <!ENTITY  walletEnabled.label         "Save form data from webpages when completing forms.">
 <!ENTITY  walletEnabled.accesskey     "f">
 <!ENTITY  viewWallet.label            "View Saved Data...">
 <!ENTITY  viewWallet.accesskey        "v">
 
-<!ENTITY  signonHeader.label          "&brandShortName; Single Signon">
-<!ENTITY  signonDescription.label     "&brandShortName; Single Signon stores your usernames and passwords for sites that require you to log in, and enters them automatically when you visit those sites.">
+<!ENTITY  signonHeader.label          "Password Manager">
+<!ENTITY  signonDescription.label     "Password Manager stores your usernames and passwords for sites that require you to log in, and enters them automatically when you visit those sites.">
 <!ENTITY  signonEnabled.label         "Remember passwords for sites that require me to log in.">
 <!ENTITY  signonEnabled.accesskey     "r">
-<!ENTITY  viewSignons.label           "View Saved Signons...">
+<!ENTITY  viewSignons.label           "View Saved Passwords...">
 <!ENTITY  viewSignons.accesskey       "e">
 
-<!ENTITY  changePasswords.label       "Change SmartFill Password...">
+<!ENTITY  changePasswords.label       "Change Forms Manager Password...">
 <!ENTITY  changePasswords.accesskey   "c">
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/prefutilities.properties b/xpfe/components/prefwindow/resources/locale/en-US/prefutilities.properties
index 34c48345f530..01499b20d1b9 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/prefutilities.properties
+++ b/xpfe/components/prefwindow/resources/locale/en-US/prefutilities.properties
@@ -3,3 +3,4 @@ choosehomepage=Choose Start Page
 choosefile=Choose a file
 viewrow=View...
 hiderow=Hide
+nofontsforlang=No fonts available for this language
\ No newline at end of file