From 6c201818da99b7bc4027eb1cb901fa34f1d74529 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Fri, 29 Nov 2002 04:50:50 +0000
Subject: [PATCH] Cut more comm dependencies; remove some unused files.

---
 .../prefwindow/content/pref-languages-add.xul |  48 --
 .../prefwindow/content/pref-languages.js      | 577 ------------------
 .../prefwindow/content/pref-languages.xul     |  86 ---
 .../prefwindow/content/pref-themes.js         |   4 +-
 .../prefwindow/content/pref-themes.xul        |   4 +-
 .../prefwindow/locale/pref-languages.dtd      |  35 --
 .../locale/pref-languages.properties          |   1 -
 7 files changed, 4 insertions(+), 751 deletions(-)
 delete mode 100644 browser/components/prefwindow/content/pref-languages-add.xul
 delete mode 100644 browser/components/prefwindow/content/pref-languages.js
 delete mode 100644 browser/components/prefwindow/content/pref-languages.xul
 delete mode 100644 browser/components/prefwindow/locale/pref-languages.dtd
 delete mode 100644 browser/components/prefwindow/locale/pref-languages.properties

diff --git a/browser/components/prefwindow/content/pref-languages-add.xul b/browser/components/prefwindow/content/pref-languages-add.xul
deleted file mode 100644
index 4683b4a201c1..000000000000
--- a/browser/components/prefwindow/content/pref-languages-add.xul
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-# 
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-# 
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
-# Reserved.
-# 
-# Contributor(s):
-#  Adrian Havill <havill@redhat.com>
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      title="&languages.customize.add.title.label;"
-      onload="Init();"
-      ondialogaccept="return AddAvailableLanguage();"
-      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"/>
- 
-  <description>&languages.customize.prefAddLangDescript;</description>
-  <separator class="thin"/>
-  <description>&languages.customize.available.label;</description>
-
-  <listbox id="available_languages" flex="1" seltype="multiple"
-           ondblclick="HandleDoubleClick(event.target)"/>
-
-  <hbox align="center">
-    <label value="&languages.customize.others.label;" control="languages.other"/>
-    <textbox id="languages.other" size="6" />
-    <label value="&languages.customize.others.examples;" control="languages.other"/>
-  </hbox>
-
-</dialog>
-
diff --git a/browser/components/prefwindow/content/pref-languages.js b/browser/components/prefwindow/content/pref-languages.js
deleted file mode 100644
index dd7d9582af29..000000000000
--- a/browser/components/prefwindow/content/pref-languages.js
+++ /dev/null
@@ -1,577 +0,0 @@
-#  -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation.  Portions created by Netscape are
-# Copyright (C) 2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Adrian Havill <havill@redhat.com>
-
-//GLOBALS
-
-
-//locale bundles
-var regionsBundle;
-var languagesBundle;
-var acceptedBundle;
-var prefLangBundle;
-
-//dictionary of all supported locales
-var availLanguageDict;
-
-//XUL listbox handles
-var available_languages;
-var active_languages;
-
-//XUL window pref window interface object
-var pref_string = new String();
-
-//Reg expression for splitting multiple pref values
-var separatorRe = /\s*,\s*/;
-
-function GetBundles()
-{
-  if (!regionsBundle)    regionsBundle   = srGetStrBundle("chrome://global/locale/regionNames.properties");
-  if (!languagesBundle)  languagesBundle = srGetStrBundle("chrome://global/locale/languageNames.properties");
-  if (!prefLangBundle)  prefLangBundle = srGetStrBundle("chrome://communicator/locale/pref/pref-languages.properties");
-  if (!acceptedBundle)   acceptedBundle  = srGetStrBundle("resource:/res/language.properties");
-}
-
-
-function Init()
-{
-  try {
-    GetBundles();
-  }
-
-  catch(ex) {
-  }
-
-  ReadAvailableLanguages();
-
-  if (!("arguments" in window)) {
-
-    //no caller arguments - load base window
-
-    try {
-      active_languages              = document.getElementById('active_languages');
-    } //try
-
-    catch(ex) {
-    } //catch
-
-    try {
-      parent.initPanel('chrome://communicator/content/pref/pref-languages.xul');
-    }
-
-    catch(ex) {
-      //pref service backup
-    } //catch
-
-    pref_string = active_languages.getAttribute("prefvalue");
-    LoadActiveLanguages();
-    SelectLanguage();
-
-  } else {
-
-    //load available languages popup
-    try {
-
-      //add language popup
-      available_languages           = document.getElementById('available_languages');
-      active_languages              = window.opener.document.getElementById('active_languages');
-      pref_string                   = window.opener.document.getElementById('intlAcceptLanguages').label;
-
-    } //try
-
-    catch(ex) {
-    } //catch
-
-    LoadAvailableLanguages();
-  }
-}
-
-
-function AddLanguage()
-{
-    //cludge: make pref string available from the popup
-    document.getElementById('intlAcceptLanguages').label = pref_string;
-    window.openDialog("chrome://communicator/content/pref/pref-languages-add.xul","_blank","modal,chrome,centerscreen,resizable=yes,titlebar", "addlangwindow");
-    UpdateSavePrefString();
-    SelectLanguage();
-}
-
-
-function ReadAvailableLanguages()
-{
-
-    availLanguageDict   = new Array();
-    var visible = new String();
-    var str = new String();
-    var i =0;
-
-    var acceptedBundleEnum = acceptedBundle.getSimpleEnumeration();
-
-    var curItem;
-  var stringName;
-  var stringNameProperty;
-
-    while (acceptedBundleEnum.hasMoreElements()) {
-
-       //progress through the bundle
-       curItem = acceptedBundleEnum.getNext();
-
-       //"unpack" the item, nsIPropertyElement is now partially scriptable
-       curItem = curItem.QueryInterface(Components.interfaces.nsIPropertyElement);
-
-       //dump string name (key)
-       stringName = curItem.key;
-       stringNameProperty = stringName.split('.');
-
-       if (stringNameProperty[1] == 'accept') {
-
-          //dump the UI string (value)
-           visible   = curItem.value;
-
-          //if (visible == 'true') {
-
-             str = stringNameProperty[0];
-             var stringLangRegion = stringNameProperty[0].split('-');
-
-             if (stringLangRegion[0]) {
-                 var tit;
-                 try {
-                    tit = languagesBundle.GetStringFromName(stringLangRegion[0]);
-                 }
-
-                 catch (ex) {
-                    tit = "";
-                 }
-
-
-                 if (stringLangRegion.length > 1) {
-
-                   try {
-                    tit += "/" + regionsBundle.GetStringFromName(stringLangRegion[1]);
-                   }
-
-                   catch (ex) {
-          tit += "["+str+"]";
-                   }
-
-                 } //if region
-
-                 tit = tit + "  [" + str + "]";
-
-             } //if language
-
-             if (str && tit) {
-
-          availLanguageDict[i] = new Array(3);
-          availLanguageDict[i][0] = tit;
-          availLanguageDict[i][1] = str;
-          availLanguageDict[i][2] = visible;
-                i++;
-
-             } // if str&tit
-            //} //if visible
-      } //if accepted
-    } //while
-    availLanguageDict.sort( // sort on first element
-      function (a, b) {
-        if (a[0] < b[0]) return -1;
-        if (a[0] > b[0]) return  1;
-        return 0;
-    });
-}
-
-
-function LoadAvailableLanguages()
-{
-  if (availLanguageDict)
-    for (var i = 0; i < availLanguageDict.length; i++) {
-
-    if (availLanguageDict[i][2] == 'true') {
-
-        AddListItem(document, available_languages, availLanguageDict[i][1], availLanguageDict[i][0]);
-
-      } //if
-
-    } //for
-}
-
-
-function LoadActiveLanguages()
-{
-  if (pref_string) {
-    var arrayOfPrefs = pref_string.split(separatorRe);
-
-    for (var i = 0; i < arrayOfPrefs.length; i++) {
-      var str = arrayOfPrefs[i];
-      var tit = GetLanguageTitle(str);
-
-      if (str) {
-        if (!tit)
-           tit = '[' + str + ']';
-        AddListItem(document, active_languages, str, tit);
-
-      } //if
-    } //for
-  }
-}
-
-
-function LangAlreadyActive(langId)
-{
-  var found = false;
-  try {
-    var arrayOfPrefs = pref_string.split(separatorRe);
-
-    if (arrayOfPrefs)
-      for (var i = 0; i < arrayOfPrefs.length; i++) {
-      if (arrayOfPrefs[i] == langId) {
-         found = true;
-         break;
-      }
-    }
-
-    return found;
-  }
-
-  catch(ex){
-     return false;
-  }
-}
-
-function isAlpha(mixedCase) {
-  var allCaps = mixedCase.toUpperCase();
-  for (var i = allCaps.length - 1; i >= 0; i--) {
-    var c = allCaps.charAt(i);
-    if (c < 'A' || c > 'Z') return false;
-  }
-  return true;
-}
-
-function isAlphaNum(mixedCase) {
-  var allCaps = mixedCase.toUpperCase();
-  for (var i = allCaps.length - 1; i >= 0; i--) {
-    var c = allCaps.charAt(i);
-    if ((c < 'A' || c > 'Z') && (c < '0' || c > '9')) return false;
-  }
-  return true;
-}
-
-function IsRFC1766LangTag(candidate) {
-  /* Valid language codes examples:
-     i.e. ja-JP-kansai (Kansai dialect of Japanese)
-          en-US-texas (Texas dialect)
-          i-klingon-tng (did TOS Klingons speak in non-English?)
-          sgn-US-MA (Martha Vineyard's Sign Language)
-  */
-  var tags = candidate.split('-');
-
-  /* if not IANA "i" or a private "x" extension, the primary
-     tag should be a ISO 639 country code, two or three letters long.
-     we don't check if the country code is bogus or not.
-  */
-  var checkedTags = 0;
-  if (tags[0].toLowerCase() != "x" && tags[0].toLowerCase() != "i") {
-    if (tags[0].length != 2 && tags[0].length != 3) return false;
-    if (!isAlpha(tags[0])) return false;
-    checkedTags++;
-
-    /* the first subtag can be either a 2 letter ISO 3166 country code,
-       or an IANA registered tag from 3 to 8 characters.
-    */
-    if (tags.length > 1) {
-      if (tags[1].length < 2 || tags[1].length > 3) return false;
-      if (!isAlphaNum(tags[1])) return false;
-
-      /* do not allow user-assigned ISO 3166 country codes */
-      if (tags[1].length == 2 && isAlpha(tags[1])) {
-        var countryCode = tags[1].toUpperCase();
-        if (countryCode == "AA" || countryCode == "ZZ") return false;
-        if (countryCode[0] == 'X') return false;
-        if (countryCode[0] == 'Q' && countryCode[1] > 'L') return false;
-      }
-      checkedTags++;
-    }
-  }
-  else if (tags.length < 2) return false;
-  else {
-    if ((tags[1].length < 1) || (tags[1].length > 8)) return false;
-    if (!isAlphaNum(tags[1])) return false;
-    checkedTags++;
-  }
-
-  /* any remaining subtags must be one to eight alphabetic characters */
-
-  for (var i = checkedTags; i < tags.length; i++) {
-    if ((tags[1].length < 1) || (tags[i].length > 8)) return false;
-    if (!isAlphaNum(tags[i])) return false;
-    checkedTags++;
-  }
-  return true;
-}
-
-function AddAvailableLanguage()
-{
-  var Languagename = new String();
-  var Languageid = new String();
-
-
-  //selected languages
-  for (var nodeIndex=0; nodeIndex < available_languages.selectedItems.length; nodeIndex++) {
-
-    var selItem =  available_languages.selectedItems[nodeIndex];
-
-    Languagename    = selItem.getAttribute('label');
-    Languageid      = selItem.getAttribute('id');
-
-    if (!LangAlreadyActive(Languageid)) {
-
-      AddListItem(window.opener.document, active_languages, Languageid, Languagename);
-
-    }//if
-
-  } //loop selected languages
-
-
-  //user-defined languages
-  var otherField = document.getElementById( "languages.other" );
-
-  if (otherField.value) {
-
-    /* reject bogus lang strings, INCLUDING those with HTTP "q"
-       values kludged on the end of them
-    */
-    if (!IsRFC1766LangTag(otherField.value)) {
-      window.alert(prefLangBundle.GetStringFromName("illegalOtherLanguage"));
-      return false;
-    }
-
-    Languageid      = otherField.value;
-    Languageid      = Languageid.toLowerCase();
-    Languagename    = GetLanguageTitle(Languageid);
-    if (!Languagename)
-       Languagename = '[' + Languageid + ']';
-
-    if (!LangAlreadyActive(Languageid)) {
-
-      AddListItem(window.opener.document, active_languages, Languageid, Languagename);
-
-    }//if
-  }
-
-  available_languages.clearSelection();
-  return true;
-} //AddAvailableLanguage
-
-function HandleDoubleClick(node)
-{
-  var languageId    = node.id;
-  var languageName  = node.getAttribute('label');
-
-  if (languageName && languageName.length > 0)
-  {
-    if (!LangAlreadyActive(languageId)) {
-      AddListItem(window.opener.document, active_languages, languageId, languageName);
-    }
-    window.close();
-  }//if
-} //HandleDoubleClick
-
-function RemoveActiveLanguage()
-{
-
-  var nextNode = null;
-  var numSelected = active_languages.selectedItems.length;
-  var deleted_all = false;
-
-  while (active_languages.selectedItems.length > 0) {
-
-  var selectedNode = active_languages.selectedItems[0];
-    nextNode = selectedNode.nextSibling;
-
-  if (!nextNode)
-
-    if (selectedNode.previousSibling)
-    nextNode = selectedNode.previousSibling;
-
-    active_languages.removeChild(selectedNode);
-   } //while
-
-  if (nextNode) {
-    active_languages.selectItem(nextNode)
-  } else {
-    //active_languages.clearSelection();
-  }
-
-  UpdateSavePrefString();
-
-} //RemoveActiveLanguage
-
-
-function GetLanguageTitle(id)
-{
-
-  if (availLanguageDict)
-    for (var j = 0; j < availLanguageDict.length; j++) {
-
-      if ( availLanguageDict[j][1] == id) {
-      //title =
-  return availLanguageDict[j][0];
-      }
-    }
-  return '';
-}
-
-
-function AddListItem(doc, listbox, langID, langTitle)
-{
-  try {  //let's beef up our error handling for languages without label / title
-
-      // Create a listitem for the new Language
-      var item = doc.createElement('listitem');
-
-      // Copy over the attributes
-      item.setAttribute('label', langTitle);
-      item.setAttribute('id', langID);
-
-      listbox.appendChild(item);
-
-  } //try
-
-  catch (ex) {
-  } //catch
-
-}
-
-
-function UpdateSavePrefString()
-{
-  var num_languages = 0;
-  pref_string = "";
-
-  for (var item = active_languages.firstChild; item != null; item = item.nextSibling) {
-
-    var languageid = item.getAttribute('id');
-
-    if (languageid.length > 1) {
-
-          num_languages++;
-
-      //separate >1 languages by commas
-      if (num_languages > 1) {
-        pref_string = pref_string + "," + " " + languageid;
-      } else {
-        pref_string = languageid;
-      } //if
-    } //if
-  }//for
-
-  active_languages.setAttribute("prefvalue", pref_string);
-}
-
-
-function MoveUp() {
-
-  if (active_languages.selectedItems.length == 1) {
-    var selected = active_languages.selectedItems[0];
-    var before = selected.previousSibling
-    if (before) {
-      before.parentNode.insertBefore(selected, before);
-      active_languages.selectItem(selected);
-      active_languages.ensureElementIsVisible(selected);
-    }
-  }
-  
-  if (active_languages.selectedIndex == 0)
-  {
-    // selected item is first
-    var moveUp = document.getElementById("up");
-    moveUp.disabled = true;
-  }
-
-  if (active_languages.childNodes.length > 1)
-  {
-    // more than one item so we can move selected item back down
-    var moveDown = document.getElementById("down");
-    moveDown.disabled = false;
-  }
-
-  UpdateSavePrefString();
-
-} //MoveUp
-
-
-function MoveDown() {
-
-  if (active_languages.selectedItems.length == 1) {
-    var selected = active_languages.selectedItems[0];
-    if (selected.nextSibling) {
-      if (selected.nextSibling.nextSibling) {
-        active_languages.insertBefore(selected, selected.nextSibling.nextSibling);
-      }
-      else {
-        active_languages.appendChild(selected);
-      }
-      active_languages.selectItem(selected);
-    }
-  }
-
-  if (active_languages.selectedIndex == active_languages.childNodes.length - 1)
-  {
-    // selected item is last
-    var moveDown = document.getElementById("down");
-    moveDown.disabled = true;
-  }
-
-  if (active_languages.childNodes.length > 1)
-  {
-    // more than one item so we can move selected item back up 
-    var moveUp = document.getElementById("up");
-    moveUp.disabled = false;
-  }
-
-  UpdateSavePrefString();
-
-} //MoveDown
-
-
-function SelectLanguage() {
-  if (active_languages.selectedItems.length) {
-    document.getElementById("remove").disabled = false;
-    var selected = active_languages.selectedItems[0];
-    document.getElementById("down").disabled = !selected.nextSibling;
-
-    document.getElementById("up").disabled = !selected.previousSibling;
-  }
-  else {
-    document.getElementById("remove").disabled = true;
-    document.getElementById("down").disabled = true;
-    document.getElementById("up").disabled = true;
-  }
-
-  if (parent.hPrefWindow.getPrefIsLocked(document.getElementById("up").getAttribute("prefstring")))
-    document.getElementById("up").disabled = true;
-  if (parent.hPrefWindow.getPrefIsLocked(document.getElementById("down").getAttribute("prefstring")))
-    document.getElementById("down").disabled = true;
-  if (parent.hPrefWindow.getPrefIsLocked(document.getElementById("add").getAttribute("prefstring")))
-    document.getElementById("add").disabled = true;
-  if (parent.hPrefWindow.getPrefIsLocked(document.getElementById("remove").getAttribute("prefstring")))
-    document.getElementById("remove").disabled = true;
-} // SelectLanguage
diff --git a/browser/components/prefwindow/content/pref-languages.xul b/browser/components/prefwindow/content/pref-languages.xul
deleted file mode 100644
index 2fa5f4d841c3..000000000000
--- a/browser/components/prefwindow/content/pref-languages.xul
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-# 
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-# 
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="Init();"
-      headertitle="&languages.customize.lHeader;">
-
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
-  <!-- XXX: Replace strres.js when pref-languages.js is converted -->
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["active_languages", "DefaultCharsetList"];
-    var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-    observerService.notifyObservers(null, "charsetmenu-selected", "other");
-  ]]>
-  </script>
-
-  <broadcaster  id="intlAcceptLanguages" 
-                value="" 
-                preftype="localizedstring" 
-                prefstring="intl.accept_languages"/>
-
-                
-  <groupbox flex="1">
-    <caption label="&langtitle.label;"/>
-
-    <description>&languages.customize.prefLangDescript;</description>
-
-    <description>&languages.customize.active.label;</description>
-    <hbox flex="1">
-      <listbox id="active_languages" flex="1" style="width: 0px; height: 0px;"
-            preftype="localizedstring" prefstring="intl.accept_languages" prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
-            seltype="multiple" onselect="SelectLanguage();"/>
-      <vbox>
-        <button oncommand="MoveUp();" id="up" class="up" disabled="true"
-                label="&languages.customize.moveUp.label;"
-                accesskey="&languages.customize.moveUp.accesskey;"
-                prefstring="pref.browser.language.disable_button.up"/>
-        <button oncommand="MoveDown();" id="down" class="down" disabled="true"
-                label="&languages.customize.moveDown.label;"
-                accesskey="&languages.customize.moveDown.accesskey;"
-                prefstring="pref.browser.language.disable_button.down"/>
-        <spacer flex="1"/>
-        <button id="add"
-                label="&languages.customize.addButton.label;"
-                oncommand="AddLanguage();"
-                prefstring="pref.browser.language.disable_button.add"/>
-        <button id="remove" disabled="true"
-                label="&languages.customize.deleteButton.label;"
-                oncommand="RemoveActiveLanguage();"
-                prefstring="pref.browser.language.disable_button.remove"/>
-      </vbox>
-    </hbox>
-  </groupbox>
-  <groupbox align="start">
-    <caption label="&languages.customize.Charset.grouplabel;"/>
-    <label value="&languages.customize.DefaultCharset.label;" control="DefaultCharsetList"/>
-    <menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
-        prefstring="intl.charset.default" preftype="localizedstring"
-        wsm_attributes="value">
-        <template>
-          <menupopup>
-            <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
-          </menupopup>
-        </template>
-    </menulist>       
-  </groupbox>
-</page>
diff --git a/browser/components/prefwindow/content/pref-themes.js b/browser/components/prefwindow/content/pref-themes.js
index 5d870b854db1..b2b6a7bfb656 100644
--- a/browser/components/prefwindow/content/pref-themes.js
+++ b/browser/components/prefwindow/content/pref-themes.js
@@ -51,7 +51,7 @@ catch(e) {}
 
 function Startup()
 {
-  gData = parent.hPrefWindow.wsm.dataManager.pageData["chrome://communicator/content/pref/pref-themes.xul"];
+  gData = parent.hPrefWindow.wsm.dataManager.pageData["chrome://browser/content/pref/pref-themes.xul"];
   var list = document.getElementById( "skinsList" );
   if ("loaded" in gData && "themeIndex" in gData) {
     list.selectedIndex = gData.themeIndex;    
@@ -101,7 +101,7 @@ function Startup()
 
 function applyTheme()
 {
-  var data = parent.hPrefWindow.wsm.dataManager.pageData["chrome://communicator/content/pref/pref-themes.xul"];
+  var data = parent.hPrefWindow.wsm.dataManager.pageData["chrome://browser/content/pref/pref-themes.xul"];
   if (data.name == null)
     return;
 
diff --git a/browser/components/prefwindow/content/pref-themes.xul b/browser/components/prefwindow/content/pref-themes.xul
index e740b5fb4c1f..95c10acb92c8 100644
--- a/browser/components/prefwindow/content/pref-themes.xul
+++ b/browser/components/prefwindow/content/pref-themes.xul
@@ -31,11 +31,11 @@
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-themes.xul'); Startup()"
+      onload="parent.initPanel('chrome://browser/content/pref/pref-themes.xul'); Startup()"
       headertitle="&lHeader;">
 
   <stringbundle id="bundle_prefutilities"
-                src="chrome://communicator/locale/pref/prefutilities.properties"/>
+                src="chrome://browser/locale/pref/prefutilities.properties"/>
   <stringbundle id="bundle_brand"
                 src="chrome://global/locale/brand.properties"/>
   <stringbundle id="bundle_navigator"
diff --git a/browser/components/prefwindow/locale/pref-languages.dtd b/browser/components/prefwindow/locale/pref-languages.dtd
deleted file mode 100644
index 7367d897ea0b..000000000000
--- a/browser/components/prefwindow/locale/pref-languages.dtd
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
-
-<!ENTITY  languages.customize.prefLangDescript          "Web pages are sometimes available in more than one language. Choose languages for displaying web pages, in order of preference.">
-<!ENTITY languages.customize.lHeader                    "Languages">
-<!ENTITY languages.customize.rHeader                    "Languages in which webpages are displayed">
-<!ENTITY langtitle.label                                "Languages for Web Pages">
-<!ENTITY languages.customize.prefAddLangDescript        "Select the language(s) you would like to add.">
-<!ENTITY languages.customize.engOrder.label             "1">
-<!ENTITY languages.customize.engOption.label            "English">
-<!ENTITY languages.customize.addButton.label            "Add...">
-<!ENTITY languages.customize.deleteButton.label         "Remove">
-<!ENTITY languages.customize.title.label			    "Customize Languages">
-<!ENTITY languages.customize.add.title.label		    "Add Languages">
-<!ENTITY languages.customize.left.header			    "Character Coding">
-<!ENTITY languages.customize.right.header			    "Select Supported Charsets">
-<!ENTITY languages.customize.available.label            "Languages:">
-<!ENTITY languages.customize.active.label               "Languages in order of preference:">
-<!ENTITY languages.customize.reorder.label              "Reorder">
-<!ENTITY languages.customize.remove.label               "Remove">
-<!ENTITY languages.customize.additional.label           "Available Charactersets">
-<!ENTITY languages.customize.add.label                  "Add">
-<!ENTITY languages.customize.others.label               "Others:">
-<!ENTITY languages.customize.Charset.grouplabel         "Character Coding">
-<!ENTITY languages.customize.DefaultCharset.label       "Default Character Coding:">
-<!-- LOCALIZATION NOTE  Charset Coding Preferences Dialog: Do NOT localize the terms "en-bz, ar-jo"  -->
-<!ENTITY languages.customize.others.examples            "e.g.: en-bz, ar-jo">
-<!ENTITY languages.customize.cancel.label		            "Cancel">
-<!ENTITY languages.customize.save.label                 "Save">
-<!ENTITY languages.customize.ok.label                   "OK">
-<!ENTITY languages.customize.save.popup                 "Please restart the browser for changes to take effect...">
-<!ENTITY languages.customize.moveUp.label               "Move Up">
-<!ENTITY languages.customize.moveUp.accesskey           "u">
-<!ENTITY languages.customize.moveDown.label             "Move Down">
-<!ENTITY languages.customize.moveDown.accesskey         "d">
-
diff --git a/browser/components/prefwindow/locale/pref-languages.properties b/browser/components/prefwindow/locale/pref-languages.properties
deleted file mode 100644
index bcfa2cf05dfe..000000000000
--- a/browser/components/prefwindow/locale/pref-languages.properties
+++ /dev/null
@@ -1 +0,0 @@
-illegalOtherLanguage=Not a valid language code.