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/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml

@@ -238,34 +238,34 @@
 
 <p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
 
-<h2 id="languages_content">Appearance Preferences - Languages/Content</h2>
+<h2 id="locales">Appearance Preferences - Languages</h2>
 
-<p>This section describes how to use the Language and Content Packs preferences
+<p>This section describes how to use the language selection preferences
   panel. If you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Appearance category, click Languages/Content. (If no
+  <li>Under the Appearance category, click Languages. (If no
     subcategories are visible, double-click Appearance to expand the
     list.)</li>
 </ol>
 
-<p>The Language and Content Packs preferences panel allows you to select a
+<p>The language selection preferences panel allows you to change the language
-  content pack and/or language pack to use within &brandShortName;.</p>
+  used in the user interface of &brandShortName;. This also includes the
+  default settings for your home page, bookmarks, toolbar contents, Sidebar,
+  and other items.</p>
 
 <ul>
-  <li><strong>Installed language packs</strong>: Select a language pack to use
+  <li><strong>Installed language packs</strong>: Select a language to use
-    within &brandShortName;.</li>
-  <li><strong>Installed content packs</strong>: Select a content pack to use
     within &brandShortName;.</li>
   <li><strong>Uninstall</strong>: Click this to uninstall a selected language
-    or content pack.</li>
+    pack.</li>
-  <li><strong>Download More</strong>: Click this to download more content or
+  <li><strong>Download More</strong>: Click this to download more
     language packs.
 
     <p><strong>Note</strong>: You must restart &brandShortName; for a new
-      content or language pack to take effect.</p>
+      language setting to take effect.</p>
   </li>
 </ul>
 

suite/locales/en-US/chrome/common/help/help-index1.rdf

@@ -1577,9 +1577,9 @@
          nc:link="cs_nav_prefs_appearance.xhtml#colors"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="preferences:content_packs"
+       <rdf:Description ID="preferences:locales"
-         nc:name="content packs preferences"
+         nc:name="User Interface languages preferences"
-         nc:link="cs_nav_prefs_appearance.xhtml#languages_content"/>
+         nc:link="cs_nav_prefs_appearance.xhtml#locales"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:cookies"

suite/locales/en-US/chrome/common/help/nav_help.xhtml

@@ -1186,27 +1186,7 @@
   </li>
 </ol>
 
-<p>The content pack you use affects the home page, bookmarks, toolbar contents,
+<p><strong>Tip</strong>: To download more language packs,
-  Sidebar, and other items.</p>
-
-<p>To use a content pack:</p>
-
-<ol>
-  <li>Open the
-    <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-    menu and choose Preferences.</li>
-  <li>Under the Appearance category, click Languages/Content. (If no
-    subcategories are visible, double-click Appearance to expand the
-    list.)</li>
-  <li>Under <q>Installed content packs</q> select a content pack.</li>
-  <li>Click OK.
-
-    <p><strong>Note</strong>: You will need to restart &brandShortName; after
-      you change to another content pack.</p>
-  </li>
-</ol>
-
-<p><strong>Tip</strong>: To download more language packs or content packs,
   click Download More.</p>
 
 <p>Web pages are sometimes available in several languages. &brandShortName;

suite/locales/en-US/chrome/common/help/profiles_help.xhtml

@@ -63,8 +63,8 @@
     <q>School</q>.</li>
   <li>Accept the default location for the new profile, or click the Choose
     Folder button and navigate to the location you want.</li>
-  <li>If you have Language Packs or Regional Content Packs installed, click
+  <li>If you have additional Language Packs installed, click
-    Region Selection and choose the Language/Content set you want.</li>
+    Select Language and choose the language you want.</li>
   <li>Click Finish.</li>
 </ol>
 
@@ -218,7 +218,7 @@
 
 <p>[<a href="#managing_profiles">Return to beginning of section</a>]</p>
 
-<p>Copyright &copy; 2003-2005 The Mozilla Foundation.</p>
+<p>Copyright &copy; 2003-2006 The Mozilla Foundation.</p>
 
 </body>
 </html>

suite/locales/en-US/chrome/common/help/suite-toc.rdf

@@ -765,7 +765,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
         <rdf:li> <rdf:Description ID="appearance_pref_fonts" nc:name="Fonts" nc:link="cs_nav_prefs_appearance.xhtml#fonts"/> </rdf:li>
         <rdf:li><rdf:Description ID="appearance_pref_colors" nc:name="Colors" nc:link="cs_nav_prefs_appearance.xhtml#colors"/> </rdf:li>
         <rdf:li><rdf:Description ID="appearance_pref_themes" nc:name="Themes" nc:link="cs_nav_prefs_appearance.xhtml#themes"/> </rdf:li>
-        <rdf:li><rdf:Description ID="appearance_pref_content_packs" nc:name="Languages/Content" nc:link="cs_nav_prefs_appearance.xhtml#languages_content"/> </rdf:li>
+        <rdf:li><rdf:Description ID="appearance_pref_locales" nc:name="Languages" nc:link="cs_nav_prefs_appearance.xhtml#locales"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>