From 86ca6291f9510a999430846d03dd97bfc86f7171 Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at>
Date: Wed, 17 May 2006 02:39:59 +0000
Subject: [PATCH] bug 325473 - Undo separation of language and region/content
 packs, part 4: move pref panel into communictor pefs in suite/, correct
 installer manifests and fix rough edges of parts 1-3, r=bsmedberg for build
 system changes (removal of content-packs extension) r=ajschult for installer
 manifests r=jag sr=Neil

---
 suite/common/pref/pref-help.js                      | 2 +-
 suite/common/pref/preftree.xul                      | 7 ++++++-
 suite/locales/en-US/chrome/common/pref/preftree.dtd | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/suite/common/pref/pref-help.js b/suite/common/pref/pref-help.js
index 9a6ae173704d..bedeaf2e7f9e 100644
--- a/suite/common/pref/pref-help.js
+++ b/suite/common/pref/pref-help.js
@@ -7,7 +7,7 @@ var fm = {
   "chrome://communicator/content/pref/pref-fonts.xul": "appearance_pref_fonts", 
   "chrome://communicator/content/pref/pref-colors.xul": "appearance_pref_colors", 
   "chrome://communicator/content/pref/pref-themes.xul": "appearance_pref_themes", 
-  "chrome://content-packs/content/pref-contentpacks.xul": "appearance_pref_content_packs",
+  "chrome://communicator/content/pref/pref-locales.xul": "appearance_pref_locales",
   "chrome://communicator/content/pref/pref-navigator.xul": "navigator_pref_navigator",
   "chrome://communicator/content/pref/pref-history.xul": "navigator_pref_history",
   "chrome://communicator/content/pref/pref-languages.xul": "navigator_pref_languages",
diff --git a/suite/common/pref/preftree.xul b/suite/common/pref/preftree.xul
index a79fab847010..abbddd5be9c7 100644
--- a/suite/common/pref/preftree.xul
+++ b/suite/common/pref/preftree.xul
@@ -72,11 +72,16 @@
             <treecell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/> 
           </treerow>
         </treeitem>
-        <treeitem id="themes-panel">
+        <treeitem>
           <treerow>
             <treecell url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/> 
           </treerow>
         </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell url="chrome://communicator/content/pref/pref-locales.xul" label="&locales.label;"/>
+          </treerow>
+        </treeitem>
       </treechildren>
     </treeitem>
     <!-- XXX remove this when overlays.rdf works for navigator -->
diff --git a/suite/locales/en-US/chrome/common/pref/preftree.dtd b/suite/locales/en-US/chrome/common/pref/preftree.dtd
index 68f026977af0..7c8138c901e5 100644
--- a/suite/locales/en-US/chrome/common/pref/preftree.dtd
+++ b/suite/locales/en-US/chrome/common/pref/preftree.dtd
@@ -5,6 +5,7 @@
 <!ENTITY fonts.label "Fonts">
 <!ENTITY colors.label "Colors">
 <!ENTITY themes.label "Themes">
+<!ENTITY locales.label "Languages">
 <!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
 <!ENTITY navigator.label "Navigator">
 <!ENTITY history.label "History">