From 444d22d764847b58a46ca3f18e20a545ef5fade8 Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Thu, 27 Jul 2006 14:38:36 +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 git-svn-id: svn://10.0.0.236/trunk@204204 18797224-902f-48f8-a5cc-f745e15eee43 --- .../common/help/cs_nav_prefs_appearance.xhtml | 22 +++++++++---------- .../en-US/chrome/common/help/help-index1.rdf | 6 ++--- .../en-US/chrome/common/help/nav_help.xhtml | 22 +------------------ .../chrome/common/help/profiles_help.xhtml | 6 ++--- .../en-US/chrome/common/help/suite-toc.rdf | 2 +- 5 files changed, 19 insertions(+), 39 deletions(-) diff --git a/mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml b/mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml index 7f052092a6a..242abc19e3a 100644 --- a/mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml +++ b/mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml @@ -238,34 +238,34 @@

[Return to beginning of section]

-

Appearance Preferences - Languages/Content

+

Appearance Preferences - Languages

-

This section describes how to use the Language and Content Packs preferences +

This section describes how to use the language selection preferences panel. If you're not already viewing it, follow these steps:

  1. Open the &brandShortName; Edit menu and choose Preferences.
    2. -
  2. Under the Appearance category, click Languages/Content. (If no +
  3. Under the Appearance category, click Languages. (If no subcategories are visible, double-click Appearance to expand the list.)
-

The Language and Content Packs preferences panel allows you to select a - content pack and/or language pack to use within &brandShortName;.

+

The language selection preferences panel allows you to change the language + used in the user interface of &brandShortName;. This also includes the + default settings for your home page, bookmarks, toolbar contents, Sidebar, + and other items.

diff --git a/mozilla/suite/locales/en-US/chrome/common/help/help-index1.rdf b/mozilla/suite/locales/en-US/chrome/common/help/help-index1.rdf index a427515d947..587c9ce47cc 100644 --- a/mozilla/suite/locales/en-US/chrome/common/help/help-index1.rdf +++ b/mozilla/suite/locales/en-US/chrome/common/help/help-index1.rdf @@ -1577,9 +1577,9 @@ nc:link="cs_nav_prefs_appearance.xhtml#colors"/> - + -

The content pack you use affects the home page, bookmarks, toolbar contents, - Sidebar, and other items.

- -

To use a content pack:

- -
    -
  1. Open the - &brandShortName; Edit - menu and choose Preferences.
    2. -
  2. Under the Appearance category, click Languages/Content. (If no - subcategories are visible, double-click Appearance to expand the - list.)
    3. -
  3. Under Installed content packs select a content pack.
    4. -
  4. Click OK. - -

    Note: You will need to restart &brandShortName; after - you change to another content pack.

    -
    5. -
- -

Tip: To download more language packs or content packs, +

Tip: To download more language packs, click Download More.

Web pages are sometimes available in several languages. &brandShortName; diff --git a/mozilla/suite/locales/en-US/chrome/common/help/profiles_help.xhtml b/mozilla/suite/locales/en-US/chrome/common/help/profiles_help.xhtml index c205525df73..e3571d2444c 100644 --- a/mozilla/suite/locales/en-US/chrome/common/help/profiles_help.xhtml +++ b/mozilla/suite/locales/en-US/chrome/common/help/profiles_help.xhtml @@ -63,8 +63,8 @@ School.

  • Accept the default location for the new profile, or click the Choose Folder button and navigate to the location you want.
    • -
  • If you have Language Packs or Regional Content Packs installed, click - Region Selection and choose the Language/Content set you want.
    • +
  • If you have additional Language Packs installed, click + Select Language and choose the language you want.
  • Click Finish.
    • @@ -218,7 +218,7 @@

    [Return to beginning of section]

    -

    Copyright © 2003-2005 The Mozilla Foundation.

    +

    Copyright © 2003-2006 The Mozilla Foundation.

    diff --git a/mozilla/suite/locales/en-US/chrome/common/help/suite-toc.rdf b/mozilla/suite/locales/en-US/chrome/common/help/suite-toc.rdf index e06a9390337..f257684a736 100644 --- a/mozilla/suite/locales/en-US/chrome/common/help/suite-toc.rdf +++ b/mozilla/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"/>     - +