diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index a83e145b790..13c747d88dc 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -25,7 +25,7 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd" >
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
-       	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         align="vertical" title="&window.title;"
         onload="parent.initPanel(panel);">
@@ -49,10 +49,10 @@
     
   ]]>
   </script>
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
-        
   <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical" id="advancedSettings">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
index 81849b984e9..dc8f94c0333 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
@@ -35,8 +35,9 @@
         title="&editType.label;"
         onload="Startup();">
 
+  <stringbundle id="bundle_prefApplications"
+                src="chrome://communicator/locale/pref/pref-applications.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
   <script type="application/x-javascript">
   <![CDATA[
@@ -47,13 +48,10 @@
     var gAskBeforeOpen    = null;
     var gIcon             = null;
     var gContentType      = null;
-    
-    var gBundle           = null;
+    var gPrefApplicationsBundle = null;
 
     var gOldMIME          = null;
-    
     var gOldDesc          = null;
-    
     var gOldExtensions   = null;
     
     function Startup()
@@ -68,7 +66,7 @@
       gAppPath          = document.getElementById("appPath");
       gAskBeforeOpen    = document.getElementById("askBeforeOpen");
         
-      gBundle           = srGetStrBundle("chrome://communicator/locale/pref/pref-applications.properties");  
+      gPrefApplicationsBundle = document.getElementById("bundle_prefApplications");
       
       var handlerInfo = window.arguments[0];
       
@@ -116,8 +114,8 @@
         filePicker = filePicker.QueryInterface(Components.interfaces.nsIFilePicker);
       if (filePicker) {
         const FP = Components.interfaces.nsIFilePicker
-        var windowTitle = gBundle.GetStringFromName("chooseHandler");
-        var programsFilter = gBundle.GetStringFromName("programsFilter");
+        var windowTitle = gPrefApplicationsBundle.getString("chooseHandler");
+        var programsFilter = gPrefApplicationsBundle.getString("programsFilter");
         filePicker.init(window, windowTitle, FP.modeOpen);
         if (navigator.platform == "Win32")
           filePicker.appendFilter(programsFilter, "*.exe; *.com");
@@ -157,8 +155,8 @@
       if (gMIMEField.value != gOldMIME) {
         var exists = mimeHandlerExists(gMIMEField.value);
         if (exists) {
-          var titleMsg = gBundle.GetStringFromName("handlerExistsTitle");
-          var dialogMsg = gBundle.GetStringFromName("handlerExists");
+          var titleMsg = gPrefApplicationsBundle.getString("handlerExistsTitle");
+          var dialogMsg = gPrefApplicationsBundle.getString("handlerExists");
           dialogMsg = dialogMsg.replace(/%mime%/g, gMIMEField.value);
           var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
                                                                     "nsICommonDialogs");
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.js
index 9e1e7234916..0606a207447 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.js
@@ -4,7 +4,7 @@ var gMIMEField        = null;
 var gAppPath          = null;
 var gOutgoingMIME     = null;
 
-var gBundle           = null;
+var gPrefApplicationsBundle = null;
 
 function Startup()
 {
@@ -16,7 +16,7 @@ function Startup()
   gAppPath          = document.getElementById("appPath");
   gOutgoingMime     = document.getElementById("outgoingDefault");
     
-  gBundle           = srGetStrBundle("chrome://communicator/locale/pref/pref-applications.properties");  
+  gPrefApplicationsBundle = document.getElementById("bundle_prefApplications");
   
   gDescriptionField.focus();
 }
@@ -27,8 +27,8 @@ function chooseApp()
   var filePicker = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
   if (filePicker) {
     const FP = Components.interfaces.nsIFilePicker
-    var windowTitle = gBundle.GetStringFromName("chooseHandler");
-    var programsFilter = gBundle.GetStringFromName("programsFilter");
+    var windowTitle = gPrefApplicationsBundle.getString("chooseHandler");
+    var programsFilter = gPrefApplicationsBundle.getString("programsFilter");
     filePicker.init(window, windowTitle, FP.modeOpen);
     if (navigator.platform == "Win32")
       filePicker.appendFilter(programsFilter, "*.exe; *.com");
@@ -61,8 +61,8 @@ function onOK()
   // figure out if this mime type already exists. 
   var exists = mimeHandlerExists(gMIMEField.value);
   if (exists) {
-    var titleMsg = gBundle.GetStringFromName("handlerExistsTitle");
-    var dialogMsg = gBundle.GetStringFromName("handlerExists");
+    var titleMsg = gPrefApplicationsBundle.getString("handlerExistsTitle");
+    var dialogMsg = gPrefApplicationsBundle.getString("handlerExists");
     dialogMsg = dialogMsg.replace(/%mime%/g, gMIMEField.value);
     var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
                                                               "nsICommonDialogs");
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
index 686a4060b6f..f9da53ae4c9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
@@ -35,7 +35,8 @@
         title="&newTypeTitle.label;"
         onload="Startup();">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <stringbundle id="bundle_prefApplications"
+                src="chrome://communicator/locale/pref/pref-applications.properties"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-applications-new.js"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.js
index aaf3a08664a..afa9d5b4f1a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.js
@@ -1,6 +1,15 @@
 
 var gNewTypeRV    = null;
 var gUpdateTypeRV = null;
+var gTree   = null;
+var gDS     = null;
+var gPrefApplicationsBundle = null;
+
+var gExtensionField = null;
+var gMIMETypeField  = null;
+var gHandlerField   = null;
+var gEditButton     = null;
+var gRemoveButton   = null;
 
 function newType()
 {
@@ -14,8 +23,8 @@ function newType()
 
 function removeType()
 {
-  var titleMsg = gBundle.GetStringFromName("removeHandlerTitle");
-  var dialogMsg = gBundle.GetStringFromName("removeHandler");
+  var titleMsg = gPrefApplicationsBundle.getString("removeHandlerTitle");
+  var dialogMsg = gPrefApplicationsBundle.getString("removeHandler");
   dialogMsg = dialogMsg.replace(/%n/g, "\n");
   var commonDialogService = nsJSComponentManager.getService("@mozilla.org/appshell/commonDialogs;1",
                                                               "nsICommonDialogs");
@@ -38,20 +47,10 @@ function editType()
   }
 }
 
-var gTree   = null;
-var gDS     = null;
-var gBundle = null;
-
-var gExtensionField = null;
-var gMIMETypeField  = null;
-var gHandlerField   = null;
-var gEditButton     = null;
-var gRemoveButton   = null;
-
 function Startup()
 {
   // set up the string bundle
-  gBundle = srGetStrBundle("chrome://communicator/locale/pref/pref-applications.properties");
+  gPrefApplicationsBundle = document.getElementById("bundle_prefApplications");
 
   // set up the elements
   gTree = document.getElementById("appTree"); 
@@ -92,9 +91,11 @@ function selectApplication()
     
     // figure out how this type is handled
     if (handlerOverride.handleInternal == "true")
-      gHandlerField.setAttribute("value", gBundle.GetStringFromName("handleInternally"));
+      gHandlerField.setAttribute("value",
+                                 gPrefApplicationsBundle.getString("handleInternally"));
     else if (handlerOverride.saveToDisk == "true")
-      gHandlerField.setAttribute("value", gBundle.GetStringFromName("saveToDisk"));
+      gHandlerField.setAttribute("value",
+                                 gPrefApplicationsBundle.getString("saveToDisk"));
     else 
       gHandlerField.setAttribute("value", handlerOverride.appDisplayName);
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
index 816a7ddb6db..cb1c0ba8692 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -28,16 +28,17 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
-    		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         class="color-dialog"
         style="-moz-user-focus: ignore;"
         title="&window.title;" align="vertical"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">
 
+  <stringbundle id="bundle_prefApplications"
+                src="chrome://communicator/locale/pref/pref-applications.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-applications.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
         
   <box class="box-smallheader" title="&lHeader;"/>
@@ -83,16 +84,16 @@
     </box>
     
     <box orient="vertical">
-	  	<button id="newTypeButton" 
+      <button id="newTypeButton" 
               value="&newTypeButton.label;" accesskey="&newTypeButton.accesskey;" 
               oncommand="newType();"/>
-  		<button id="editButton" 
+      <button id="editButton" 
               value="&editButton.label;" accesskey="&editButton.accesskey;" 
               oncommand="editType();"/>
-	  	<button id="removeButton" 
+      <button id="removeButton" 
               value="&removeButton.label;" accesskey="&removeButton.accesskey;" 
               oncommand="removeType();"/>
- 	  </box>
+    </box>
   </titledbox>
     
   <titledbox orient="vertical">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.js
index 7679bbab233..4ff3c98f361 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.js
@@ -1,24 +1,23 @@
 function prefCacheSelectFolder()
 {
-  bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
+  var prefutilitiesBundle = document.getElementById("bundle_prefutilities");
   var folderField = document.getElementById("browserCacheDirectory");
-  var file = getFileOrFolderSpec( bundle.GetStringFromName("cachefolder"), true );
+  var file = getFileOrFolderSpec(prefutilitiesBundle.getString("cachefolder"),
+                                 true);
   if ( file && file != -1 )
     folderField.value = file.unicodePath;
 }
 
 function prefClearMemCache()
 {
-	dump("prefClearMemCache \n");
-	var cache = Components.classes['@mozilla.org/network/cache;1?name=manager'].getService();
-  var	cacheService = cache.QueryInterface( Components.interfaces.nsINetDataCacheManager);
-	cacheService.clear( 2 );
+  var cache = Components.classes['@mozilla.org/network/cache;1?name=manager'].getService();
+  var cacheService = cache.QueryInterface( Components.interfaces.nsINetDataCacheManager);
+  cacheService.clear( 2 );
 }
 
 function prefClearDiskCache()
 {
-	dump("prefClearDiskCache \n");
-	var cache = Components.classes['@mozilla.org/network/cache;1?name=manager'].getService();
-  var	cacheService = cache.QueryInterface( Components.interfaces.nsINetDataCacheManager);
-	cacheService.clear( 12 );
+  var cache = Components.classes['@mozilla.org/network/cache;1?name=manager'].getService();
+  var cacheService = cache.QueryInterface( Components.interfaces.nsINetDataCacheManager);
+  cacheService.clear( 12 );
 }
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 8c0ad051f91..8c310d22308 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -25,10 +25,10 @@
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
 <window xmlns:html="http://www.w3.org/1999/xhtml"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical" title="&title.label;"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -36,6 +36,9 @@
   ]]>
   </script>
   
+  <stringbundle id="bundle_prefutilities"
+                src="chrome://communicator/locale/pref/prefutilities.properties"/>
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-cache.js"/>
@@ -83,7 +86,7 @@
     <separator class="thin"/>
     
     <html>&docCache;</html>
-	<box orient="vertical" autostretch="never" class="indent">
+    <box orient="vertical" autostretch="never" class="indent">
       <radiogroup id="browserCacheCheckDocFrequency" orient="vertical" autostretch="never"
                   pref="true" preftype="int" prefstring="browser.cache.check_doc_frequency"
                   prefattribute="data">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.js
index 84d633b0d48..d9431aa5155 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.js
@@ -16,7 +16,7 @@ var fontTypes   = ["serif","sans-serif", /*"cursive", "fantasy",*/"monospace"];
 var variableSize, fixedSize, languageList;
 var languageData = [];
 var currentLanguage;
-var bundle;
+var gPrefutilitiesBundle;
 
 // manual data retrieval function for PrefWindow
 function GetFields()
@@ -98,13 +98,13 @@ function Startup()
     fixedSize    = document.getElementById( "sizeMono" );
     languageList = document.getElementById( "selectLangs" );
 
-    bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
+    gPrefutilitiesBundle = document.getElementById("bundle_prefutilities");
   
     // register our ok callback function
     parent.hPrefWindow.registerOKCallbackFunc( saveFontPrefs );
     
     // eventually we should detect the default language and select it by default
-	  selectLanguage();
+    selectLanguage();
   }
   
 function listElement( aListID )
@@ -143,7 +143,8 @@ listElement.prototype =
               if( faces[i] == "" )
                 {
                   this.listElement.setAttribute( "data", faces[i] );
-                  this.listElement.setAttribute( "value", bundle.GetStringFromName("nofontsforlang") );
+                  this.listElement.setAttribute("value",
+                                                gPrefutilitiesBundle.getString("nofontsforlang"));
                   this.listElement.setAttribute( "disabled", "true" );
                   gNoFontsForThisLang = true; // hack, hack hack!
                 }
@@ -255,7 +256,7 @@ function saveState()
   }  
   
 function selectLanguage()
-	{
+  {
     // save current state
     saveState();
     
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index afca6ab2c3e..6f2c1cee69b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -32,7 +32,10 @@
         orient="vertical"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">
 
+  <stringbundle id="bundle_prefutilities"
+                src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-fonts.js"/>
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
index 5aee3d48cd7..7f2c88d647f 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
@@ -27,11 +27,12 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >
 
 <window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical" title="&title.label;"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">
 
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
@@ -77,7 +78,7 @@
   
   <!-- history -->
   <titledbox orient="vertical">
-  	<title><text value="&header3.label;"/></title>
+    <title><text value="&header3.label;"/></title>
     <html>&historyPages.label;</html>
     <box autostretch="never">
       <text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
@@ -93,7 +94,7 @@
   
   <!-- no honey, I haven't been viewing porn, honest! -->
   <titledbox orient="vertical">
-  	<title><text value="&locationBarHistory.label;"/></title>
+    <title><text value="&locationBarHistory.label;"/></title>
     <box autostretch="never">
       <html flex="1">&clearLocationBar.label;</html>
       <box autostretch="never" halign="right">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
index f5167fd7b6c..467abb26395 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
@@ -36,6 +36,7 @@
   style="width: 25em;height: 25em;">
 
   <script type="application/x-javascript" src="pref-languages.js"/>
+  <!-- XXX: Replace strres.js when pref-languages is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <keyset id="keyset"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 97ab6e6ffeb..2cc2e5a4b9a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -31,6 +31,7 @@
   onload="Init();" orient="vertical">
 
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
+  <!-- XXX: Replace strres.js when prefutilities (and pref-languages) is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
   <script type="application/x-javascript">
@@ -80,7 +81,7 @@
                 oncommand="RemoveActiveLanguage();"/>
       </box>
     </box>
-	</titledbox>
+  </titledbox>
   <titledbox orient="vertical" autostretch="never">
     <title value="&languages.customize.Charset.grouplabel;"/>
     <box autostretch="never">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index 7d4aaacba37..fcdb8c64231 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -84,6 +84,7 @@
 
   ]]>
   </script>
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index 93d1ad4915b..a58516ac112 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -28,11 +28,12 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >
 
 <window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical" title="&title.label;"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">
 
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
@@ -49,7 +50,7 @@
 
   <!-- navigator starts with -->  
   <titledbox>
-	  <title value="&navRadio;"/>
+    <title value="&navRadio;"/>
     
     <radiogroup id="startupPage" autostretch="never" orient="vertical"
                 pref="true" preftype="int" prefstring="browser.startup.page"
@@ -60,10 +61,10 @@
     </radiogroup>
 
   </titledbox>
-	
+
   <!-- homepage specification -->
   <titledbox orient="vertical">
-  	<title value="&header2.label;"/>
+    <title value="&header2.label;"/>
     <html>&homePageIntro.label;</html>
     <box autostretch="never">
       <text class="label" value="&location.label;" accesskey="&location.accesskey;" for="browserStartupHomepage"/>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.js
index 8047a9d8690..3a40a8cc9a1 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.js
@@ -1,14 +1,14 @@
 function showManualProxyConfig()
 {
   var manualRow = document.getElementById("manual-proxy");
-  bundle = srGetStrBundle("chrome://pref/locale/prefutilities.properties");
+  var prefutilitiesBundle = document.getElementById("bundle_prefutilities");
   var viewHideButton = document.getElementById("viewhideManual");
   if( manualRow.style.display == "none" ) {
-    viewHideButton.value = bundle.GetStringFromName("hiderow");
+    viewHideButton.value = prefutilitiesBundle.getString("hiderow");
     manualRow.style.display = "inherit";
   }
   else {
-    viewHideButton.value = bundle.GetStringFromName("viewrow");
+    viewHideButton.value = prefutilitiesBundle.getString("viewrow");
     manualRow.style.display = "none"
   }
 }
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index 6c0e1b90f27..9691d018d99 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -36,15 +36,18 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["networkProxyType",
-	"networkProxyFTP", "networkProxyFTP_Port",
-	"networkProxyGopher", "networkProxyGopher_Port",
-	"networkProxyHTTP", "networkProxyHTTP_Port", 
-	"networkProxySSL", "networkProxySSL_Port", 
-	"networkProxySOCKS", "networkProxySOCKS_Port",
-	"networkProxyNone", "networkProxyAutoconfigURL"];
+                       "networkProxyFTP", "networkProxyFTP_Port",
+                       "networkProxyGopher", "networkProxyGopher_Port",
+                       "networkProxyHTTP", "networkProxyHTTP_Port", 
+                       "networkProxySSL", "networkProxySSL_Port", 
+                       "networkProxySOCKS", "networkProxySOCKS_Port",
+                       "networkProxyNone", "networkProxyAutoconfigURL"];
   ]]>
   </script>
         
+  <stringbundle id="bundle_prefutilities"
+                src="chrome://pref/locale/prefutilities.properties"/>
+  <!-- XXX: Replace strres.js when prefutilities is converted -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
@@ -119,7 +122,7 @@
               <textfield id="networkProxySOCKS_Port" pref="true" preftype="int" prefstring="network.proxy.socks_port"
                        prefattribute="value" size="5"/>
             </box>
-	  </row>
+          </row>
           <row> 
             <text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
             <textfield id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index ae4061db863..cf19f0a780f 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -19,7 +19,7 @@
    Rights Reserved.
    
    Contributor(s): 
-	Blake Ross <blakeross@telocity.com>
+   Blake Ross <blakeross@telocity.com>
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
@@ -34,17 +34,18 @@
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         class="color-dialog"
-		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&title.label;" 
         orient="vertical"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <stringbundle id="bundle_region"
+                src="chrome://global-region/locale/region.properties"/>
   <script type="application/x-javascript">
   <![CDATA[
   
-  var _elementIDs = ["browserRelatedDisabledForDomains", "addDomain", "browserGoBrowsingEnabled",                      "browserAutoCompleteEnabled"];
-  
+  var _elementIDs = ["browserRelatedDisabledForDomains", "addDomain",
+                     "browserGoBrowsingEnabled", "browserAutoCompleteEnabled"];
   
   function Startup()
   {
@@ -150,9 +151,8 @@
   function moreInfo()
   {
     var browserURL = null;
-    var bundle = srGetStrBundle("chrome://global-region/locale/region.properties");
-    if (bundle)
-      var smartBrowsingURL = bundle.GetStringFromName("smartBrowsingURL");
+    var regionBundle = document.getElementById("bundle_region");
+    var smartBrowsingURL = regionBundle.getString("smartBrowsingURL");
     if (smartBrowsingURL) {
       try {
         var prefs = Components.classes["@mozilla.org/preferences;1"];
@@ -180,8 +180,8 @@
   <box class="box-smallheader" title="&lHeader;"/>
 
   <titledbox orient="vertical">
-	  <title><text value="&whatsRelated.label;"/></title>
-		
+    <title><text value="&whatsRelated.label;"/></title>
+
     <html id="doNotAcceptText">&doNotDecp.label;</html>
     
     <grid flex="1">
@@ -219,7 +219,7 @@
   </titledbox>
 
   <titledbox orient="vertical">
-	  <title><text value="&internetKeywordsHeader.label;"/></title>
+    <title><text value="&internetKeywordsHeader.label;"/></title>
 
     <html>&internetKeywordsDescription.label;</html>
     
@@ -234,17 +234,13 @@
   </titledbox>
 
   <titledbox orient="vertical">
- 	  <title><text value="&autoCompleteHeader.label;"/></title>
- 
-     <html>&autoCompleteDescription.label;</html>
-     
-     <box autostretch="never">
-       <checkbox id="browserAutoCompleteEnabled" value="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
-                 pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
-                 prefattribute="checked"/>
-       <spring flex="1"/>
-     </box>
-     
-   </titledbox>
-		
+    <title><text value="&autoCompleteHeader.label;"/></title>
+      <html>&autoCompleteDescription.label;</html>
+      <box autostretch="never">
+        <checkbox id="browserAutoCompleteEnabled" value="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
+                  pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
+                  prefattribute="checked"/>
+      <spring flex="1"/>
+    </box>
+  </titledbox>
 </window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.js
index 23de83f8b5e..04d8949921f 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.js
@@ -2,7 +2,7 @@
 // Theme Selector
 // ( 05/09/2000, Ben Goodger <ben@netscape.com> )
 
-var bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
+var gPrefutilitiesBundle;
 
 const DEBUG_USE_PROFILE = true;
 
@@ -16,6 +16,7 @@ catch(e) {}
 
 function Startup()
 {
+  gPrefutilitiesBundle = document.getElementById("bundle_prefutilities");
   var tree = document.getElementById( "skinsTree" );
   var theSkinKids = document.getElementById("theSkinKids");
   if (theSkinKids.hasChildNodes() && theSkinKids.firstChild)
@@ -77,15 +78,15 @@ function themeSelect()
       description.removeChild(description.firstChild);
     description.appendChild(descText);
     var applyButton = document.getElementById("applySkin");
-	var uninstallButton = document.getElementById("uninstallSkin");
-    var applyLabel = bundle.GetStringFromName("applyThemePrefix");
-	var uninstallLabel = bundle.GetStringFromName("uninstallThemePrefix");
+    var uninstallButton = document.getElementById("uninstallSkin");
+    var applyLabel = gPrefutilitiesBundle.getString("applyThemePrefix");
+    var uninstallLabel = gPrefutilitiesBundle.getString("uninstallThemePrefix");
     applyLabel = applyLabel.replace(/%theme_name%/, themeName);
-	uninstallLabel = uninstallLabel.replace(/%theme_name%/, themeName);
+    uninstallLabel = uninstallLabel.replace(/%theme_name%/, themeName);
     applyButton.value = applyLabel;
-	uninstallButton.value = uninstallLabel;
-	var locType = selectedItem.getAttribute("loctype");
-	uninstallButton.disabled = (locType == "install"); 
+    uninstallButton.value = uninstallLabel;
+    var locType = selectedItem.getAttribute("loctype");
+    uninstallButton.disabled = (locType == "install"); 
   }
 }
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
index ca4bd841bb8..7cff3f16494 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -35,7 +35,8 @@
         onload="Startup()"
         orient="vertical">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <stringbundle id="bundle_prefutilities"
+                src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-themes.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>