From 7ed56062bb0958ccce3792fdb515d044d122d9c9 Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Sat, 8 Apr 2006 11:17:06 +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@193936 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/allmakefiles.sh | 7 +- mozilla/build/unix/modules.mk | 6 +- mozilla/configure.in | 4 +- mozilla/embedding/config/embed-jar.mn | 4 +- mozilla/embedding/config/installed-chrome.txt | 2 +- .../en-US/cs_nav_prefs_appearance.xhtml | 22 ++-- .../resources/locale/en-US/help-index1.rdf | 6 +- .../help/resources/locale/en-US/help-toc.rdf | 2 +- .../resources/locale/en-US/nav_help.xhtml | 22 +--- .../locale/en-US/profiles_help.xhtml | 6 +- mozilla/netwerk/test/jarlist.dat | 8 +- mozilla/suite/Makefile.in | 2 + mozilla/suite/common/Makefile.in | 45 ++++++++ mozilla/suite/common/jar.mn | 7 ++ mozilla/suite/common/pref/pref-locales.xul | 101 +++--------------- mozilla/suite/locales/Makefile.in | 47 ++++++++ .../en-US/chrome/common/pref/pref-locales.dtd | 20 ++-- mozilla/suite/locales/jar.mn | 9 ++ .../prefwindow/resources/content/pref-help.js | 2 +- .../prefwindow/resources/content/preftree.xul | 7 +- .../resources/locale/en-US/preftree.dtd | 1 + .../build/win/mozilla/XPI_JSTs/browser.jst | 1 - .../packager/build/win/mozilla/config.it | 25 +---- mozilla/xpinstall/packager/mac/browser.jst | 1 - mozilla/xpinstall/packager/mac/langenus.jst | 8 +- mozilla/xpinstall/packager/mac/regus.jst | 62 ----------- mozilla/xpinstall/packager/os2/browser.jst | 1 - mozilla/xpinstall/packager/os2/config.it | 34 ++---- mozilla/xpinstall/packager/os2/langenus.jst | 10 +- mozilla/xpinstall/packager/os2/regus.jst | 98 ----------------- mozilla/xpinstall/packager/packages-os2 | 14 +-- .../xpinstall/packager/packages-static-unix | 14 +-- .../xpinstall/packager/packages-static-win | 14 +-- mozilla/xpinstall/packager/packages-unix | 14 +-- mozilla/xpinstall/packager/packages-win | 16 +-- mozilla/xpinstall/packager/unix/browser.jst | 1 - mozilla/xpinstall/packager/unix/config.it | 28 ++--- mozilla/xpinstall/packager/unix/langenus.jst | 18 ++-- mozilla/xpinstall/packager/unix/regus.jst | 61 ----------- .../xpinstall/packager/windows/browser.jst | 1 - mozilla/xpinstall/packager/windows/config.it | 30 ++---- .../xpinstall/packager/windows/langenus.jst | 10 +- mozilla/xpinstall/packager/windows/regus.jst | 95 ---------------- 43 files changed, 255 insertions(+), 631 deletions(-) create mode 100644 mozilla/suite/common/Makefile.in create mode 100644 mozilla/suite/common/jar.mn create mode 100644 mozilla/suite/locales/Makefile.in create mode 100644 mozilla/suite/locales/jar.mn delete mode 100644 mozilla/xpinstall/packager/mac/regus.jst delete mode 100644 mozilla/xpinstall/packager/os2/regus.jst delete mode 100644 mozilla/xpinstall/packager/unix/regus.jst delete mode 100644 mozilla/xpinstall/packager/windows/regus.jst diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh index a13b25c4536..0e70acba0ec 100755 --- a/mozilla/allmakefiles.sh +++ b/mozilla/allmakefiles.sh @@ -933,8 +933,10 @@ MAKEFILES_suite=" suite/Makefile suite/app/Makefile suite/branding/Makefile +suite/common/Makefile suite/components/Makefile suite/components/xulappinfo/Makefile +suite/locales/Makefile " MAKEFILES_xulrunner=" @@ -1436,10 +1438,6 @@ for extension in $MOZ_EXTENSIONS; do extensions/access-builtin/Makefile extensions/access-builtin/accessproxy/Makefile " ;; - content-packs ) MAKEFILES_extensions="$MAKEFILES_extensions - extensions/content-packs/Makefile - extensions/content-packs/resources/Makefile - " ;; cookie ) MAKEFILES_extensions="$MAKEFILES_extensions extensions/cookie/Makefile " ;; @@ -2071,7 +2069,6 @@ MAKEFILES_zlib="modules/zlib/standalone/Makefile" commandhandler) add_makefiles "$MAKEFILES_commandhandler" ;; composer) add_makefiles "$MAKEFILES_composer" ;; content) add_makefiles "$MAKEFILES_content" ;; - content-packs) add_makefiles "$MAKEFILES_content_packs" ;; cookie) add_makefiles "$MAKEFILES_cookie" ;; docshell) add_makefiles "$MAKEFILES_docshell" ;; dom) add_makefiles "$MAKEFILES_dom" ;; diff --git a/mozilla/build/unix/modules.mk b/mozilla/build/unix/modules.mk index 1d7d1eb1d09..75432394371 100644 --- a/mozilla/build/unix/modules.mk +++ b/mozilla/build/unix/modules.mk @@ -62,7 +62,7 @@ ifneq ($(BUILD_MODULES),all) #### Generated lines go after this line. # Available modules are: -# TestStreamConv TestXPC TestXPTC accessibility addrbook appcomps apprunner appshell autoconfig bayesflt browser build calendar caps chardet chatzilla chrome commandhandler composer content content-packs cookie dbm docshell dom downloadmanager editor embed embed_base embed_lite embedcomponents expat exthandler filepicker find gfx gtkembedmoz gtkembedmoz-wrapper gtkxtbin help helperAppDlg history htmlparser i18n ical icalss imgbmp imggif imgjpeg imglib2 imgpng imgxbm impComm4xMail impText import inspector intl ipcd ipcd_test jar java jpeg js jsconsole jsdebug jsloader jsurl layout layout_debug libart_lgpl libreg liveconnect locale lwbrk macmorefiles mailnews mailview mime mimeemitter mimemitter mimetype mork mozldap msgbase msgbaseutil msgcompose msgdb msgimap msglocal msgmdn msgnews msgsmime myspell necko nkcache nkdatetime nkfinger offline-startup oji p3p plugin png pref prefetch prefmigr profdirserviceprovider profile profilesharingsetup progressDlg psm rdf rdfutil shistory sidebar spellchecker string svg_doc system-pref test_necko tm_test transformiix txmgr txtsvc typeaheadfind ucnative uconv ucvcn ucvibm ucvja ucvko ucvlatin ucvmath ucvtw ucvtw2 unicharutil universalchardet uriloader util v-imagedecoders vcard venkman view wallet walletviewers webbrowserpersist webbrwsr webshell webshell_tests websrvcs widget windowwatcher wsproxytest xlibrgb xml-rpc xmlextras xpcom xpcom_compat_c xpcom_obsolete xpcomsample xpconnect xpconnect_tests xpcshell xpctest xpinstall xpistub xpnet xprintutil xremoteservice xul xuldoc xultmpl zlib +# TestStreamConv TestXPC TestXPTC accessibility addrbook appcomps apprunner appshell autoconfig bayesflt browser build calendar caps chardet chatzilla chrome commandhandler composer content cookie dbm docshell dom downloadmanager editor embed embed_base embed_lite embedcomponents expat exthandler filepicker find gfx gtkembedmoz gtkembedmoz-wrapper gtkxtbin help helperAppDlg history htmlparser i18n ical icalss imgbmp imggif imgjpeg imglib2 imgpng imgxbm impComm4xMail impText import inspector intl ipcd ipcd_test jar java jpeg js jsconsole jsdebug jsloader jsurl layout layout_debug libart_lgpl libreg liveconnect locale lwbrk macmorefiles mailnews mailview mime mimeemitter mimemitter mimetype mork mozldap msgbase msgbaseutil msgcompose msgdb msgimap msglocal msgmdn msgnews msgsmime myspell necko nkcache nkdatetime nkfinger offline-startup oji p3p plugin png pref prefetch prefmigr profdirserviceprovider profile profilesharingsetup progressDlg psm rdf rdfutil shistory sidebar spellchecker string svg_doc system-pref test_necko tm_test transformiix txmgr txtsvc typeaheadfind ucnative uconv ucvcn ucvibm ucvja ucvko ucvlatin ucvmath ucvtw ucvtw2 unicharutil universalchardet uriloader util v-imagedecoders vcard venkman view wallet walletviewers webbrowserpersist webbrwsr webshell webshell_tests websrvcs widget windowwatcher wsproxytest xlibrgb xml-rpc xmlextras xpcom xpcom_compat_c xpcom_obsolete xpcomsample xpconnect xpconnect_tests xpcshell xpctest xpinstall xpistub xpnet xprintutil xremoteservice xul xuldoc xultmpl zlib BM_DIRS_TestStreamConv = modules/libimg/png xpcom xpcom/string intl/strres intl/uconv/native webshell/public intl/unicharutil intl/lwbrk widget/src/gtkxtbin js/src/fdlibm js/src js/src/xpconnect netwerk/mime uriloader/base embedding/components/windowwatcher/public rdf/util parser/expat modules/libutil parser/htmlparser rdf ipc/ipcd embedding/components/profilesharingsetup profile/dirserviceprovider xpfe/components/shistory embedding/components/webbrowserpersist db/mdb/public db/mork/src db/mork/build xpfe/browser/public xpfe embedding/components/ui/progressDlg xpfe/components/download-manager directory/xpcom/base editor/txmgr xpfe/components/directory xpfe/components/find/public xpfe/components/find/src xpfe/components/search/datasets xpfe/components/search/public xpfe/components/search/src xpfe/components/related/public xpfe/components/related/src xpfe/components/intl xpfe/components/windowds xpfe/components/autocomplete/public xpfe/components/autocomplete/src xpfe/components/bookmarks/public xpfe/components/bookmarks/src xpfe/components/urlbarhistory/public xpfe/components/urlbarhistory/src xpfe/components/build xpfe/components/history/public xpfe/components/history embedding/browser/webBrowser embedding/browser/build xpcom/obsolete profile/pref-migrator profile xpfe/appshell xpfe/components/xremote/public xpfe/components/xremote widget/public widget/src view content/xul/content content/xul/templates content/xul/document embedding/components/commandhandler editor/composer/public editor/txtsvc editor accessible netwerk/protocol/viewsource netwerk/protocol/gopher netwerk/build2 sun-java modules/libjar js/src/liveconnect modules/oji other-licenses/libart_lgpl layout embedding/components/ui/helperAppDlg embedding/components/find uriloader/prefetch docshell embedding/components/jsconsole/public embedding/base embedding/components/windowwatcher/src embedding/components/appstartup/src embedding/components/jsconsole/src embedding/components/printingui/src/unixshared embedding/components/build intl/chardet/public intl/chardet/src intl/uconv intl/locale gfx/src/xprintutil gfx/src/xlibrgb gfx rdf/chrome/src rdf/chrome/build content dom uriloader/exthandler modules/plugin caps modules/libpref netwerk/cache jpeg modules/libpr0n netwerk netwerk/streamconv/test BM_CVS_TestStreamConv = modules/libimg/png xpcom xpcom/string intl/strres intl/uconv/native webshell/public intl/unicharutil intl/lwbrk widget/src/gtkxtbin js/src/fdlibm js/src js/src/xpconnect netwerk/mime uriloader/base embedding/components/windowwatcher/public rdf/util parser/expat modules/libutil parser/htmlparser rdf ipc/ipcd embedding/components/profilesharingsetup profile/dirserviceprovider xpfe/components/shistory embedding/components/webbrowserpersist db/mdb/public db/mork/src db/mork/build xpfe/browser/public xpfe embedding/components/ui/progressDlg xpfe/components/download-manager directory/xpcom/base editor/txmgr xpfe/components/directory xpfe/components/find/public xpfe/components/find/src xpfe/components/search/datasets xpfe/components/search/public xpfe/components/search/src xpfe/components/related/public xpfe/components/related/src xpfe/components/intl xpfe/components/windowds xpfe/components/autocomplete/public xpfe/components/autocomplete/src xpfe/components/bookmarks/public xpfe/components/bookmarks/src xpfe/components/urlbarhistory/public xpfe/components/urlbarhistory/src xpfe/components/build xpfe/components/history/public xpfe/components/history embedding/browser/webBrowser embedding/browser/build xpcom/obsolete profile/pref-migrator profile xpfe/appshell xpfe/components/xremote/public xpfe/components/xremote widget/public widget/src view content/xul/content content/xul/templates content/xul/document embedding/components/commandhandler editor/composer/public editor/txtsvc editor accessible netwerk/protocol/viewsource netwerk/protocol/gopher netwerk/build2 sun-java modules/libjar js/src/liveconnect modules/oji other-licenses/libart_lgpl layout embedding/components/ui/helperAppDlg embedding/components/find uriloader/prefetch docshell embedding/components/jsconsole/public embedding/base embedding/components/windowwatcher/src embedding/components/appstartup/src embedding/components/jsconsole/src embedding/components/printingui/src/unixshared embedding/components/build intl/chardet/public intl/chardet/src intl/uconv intl/locale gfx/src/xprintutil gfx/src/xlibrgb gfx rdf/chrome/src rdf/chrome/build content dom uriloader/exthandler modules/plugin caps modules/libpref netwerk/cache jpeg modules/libpr0n netwerk netwerk/streamconv/test @@ -144,10 +144,6 @@ BM_DIRS_content = modules/libimg/png xpcom xpcom/string intl/uconv/native webshe BM_CVS_content = modules/libimg/png xpcom xpcom/string intl/uconv/native webshell/public gfx/src/xprintutil intl/unicharutil intl/lwbrk widget/src/gtkxtbin js/src/fdlibm js/src js/src/xpconnect uriloader/base embedding/components/windowwatcher/public rdf/util parser/expat modules/libutil parser/htmlparser rdf ipc/ipcd embedding/components/profilesharingsetup profile/dirserviceprovider xpfe/components/shistory embedding/components/webbrowserpersist db/mdb/public db/mork/src db/mork/build xpfe/browser/public xpfe embedding/components/ui/progressDlg xpfe/components/download-manager directory/xpcom/base editor/txmgr xpfe/components/directory xpfe/components/find/public xpfe/components/find/src xpfe/components/search/datasets xpfe/components/search/public xpfe/components/search/src xpfe/components/related/public xpfe/components/related/src xpfe/components/intl xpfe/components/windowds xpfe/components/autocomplete/public xpfe/components/autocomplete/src xpfe/components/bookmarks/public xpfe/components/bookmarks/src xpfe/components/urlbarhistory/public xpfe/components/urlbarhistory/src xpfe/components/build xpfe/components/history/public xpfe/components/history embedding/browser/webBrowser embedding/browser/build xpcom/obsolete profile/pref-migrator profile xpfe/appshell xpfe/components/xremote/public xpfe/components/xremote widget/public widget/src view content/xul/content content/xul/templates content/xul/document embedding/components/commandhandler editor/composer/public editor/txtsvc editor accessible sun-java modules/libjar js/src/liveconnect modules/oji other-licenses/libart_lgpl layout gfx/src/xlibrgb gfx intl/locale embedding/components/ui/helperAppDlg embedding/components/find uriloader/prefetch docshell uriloader/exthandler modules/plugin caps dom embedding/components/jsconsole/public embedding/base embedding/components/windowwatcher/src embedding/components/appstartup/src embedding/components/jsconsole/src embedding/components/printingui/src/unixshared embedding/components/build intl/chardet/public intl/chardet/src intl/uconv netwerk/mime netwerk/protocol/viewsource netwerk/protocol/gopher netwerk/build2 netwerk intl/strres modules/libpref netwerk/cache jpeg modules/libpr0n rdf/chrome/src rdf/chrome/build content -BM_DIRS_content-packs = extensions/content-packs -BM_CVS_content-packs = extensions/content-packs - - BM_DIRS_cookie = xpcom xpcom/string webshell/public modules/libimg/png js/src/fdlibm js/src js/src/xpconnect ipc/ipcd xpcom/obsolete embedding/components/profilesharingsetup modules/libpref netwerk/cache intl/uconv/native widget/src/gtkxtbin netwerk/mime uriloader/base embedding/components/windowwatcher/public rdf/util intl/unicharutil parser/expat modules/libutil parser/htmlparser rdf profile/dirserviceprovider xpfe/components/shistory embedding/components/webbrowserpersist db/mdb/public db/mork/src db/mork/build xpfe/browser/public xpfe embedding/components/ui/progressDlg xpfe/components/download-manager directory/xpcom/base editor/txmgr xpfe/components/directory xpfe/components/find/public xpfe/components/find/src xpfe/components/search/datasets xpfe/components/search/public xpfe/components/search/src xpfe/components/related/public xpfe/components/related/src xpfe/components/intl xpfe/components/windowds xpfe/components/autocomplete/public xpfe/components/autocomplete/src xpfe/components/bookmarks/public xpfe/components/bookmarks/src xpfe/components/urlbarhistory/public xpfe/components/urlbarhistory/src xpfe/components/build xpfe/components/history/public xpfe/components/history embedding/browser/webBrowser embedding/browser/build profile/pref-migrator profile xpfe/appshell xpfe/components/xremote/public xpfe/components/xremote widget/public widget/src view editor/composer/public intl/lwbrk content/xul/content content/xul/templates content/xul/document embedding/components/ui/helperAppDlg embedding/components/find embedding/components/commandhandler editor/txtsvc editor uriloader/prefetch docshell embedding/components/jsconsole/public embedding/base embedding/components/windowwatcher/src embedding/components/appstartup/src embedding/components/jsconsole/src embedding/components/printingui/src/unixshared embedding/components/build intl/chardet/public intl/chardet/src intl/uconv intl/locale accessible netwerk/protocol/viewsource netwerk/protocol/gopher netwerk/build2 sun-java modules/libjar js/src/liveconnect modules/oji other-licenses/libart_lgpl layout rdf/chrome/src rdf/chrome/build content gfx/src/xprintutil gfx/src/xlibrgb gfx jpeg modules/libpr0n netwerk intl/strres uriloader/exthandler modules/plugin caps dom extensions/cookie BM_CVS_cookie = xpcom xpcom/string webshell/public modules/libimg/png js/src/fdlibm js/src js/src/xpconnect ipc/ipcd xpcom/obsolete embedding/components/profilesharingsetup modules/libpref netwerk/cache intl/uconv/native widget/src/gtkxtbin netwerk/mime uriloader/base embedding/components/windowwatcher/public rdf/util intl/unicharutil parser/expat modules/libutil parser/htmlparser rdf profile/dirserviceprovider xpfe/components/shistory embedding/components/webbrowserpersist db/mdb/public db/mork/src db/mork/build xpfe/browser/public xpfe embedding/components/ui/progressDlg xpfe/components/download-manager directory/xpcom/base editor/txmgr xpfe/components/directory xpfe/components/find/public xpfe/components/find/src xpfe/components/search/datasets xpfe/components/search/public xpfe/components/search/src xpfe/components/related/public xpfe/components/related/src xpfe/components/intl xpfe/components/windowds xpfe/components/autocomplete/public xpfe/components/autocomplete/src xpfe/components/bookmarks/public xpfe/components/bookmarks/src xpfe/components/urlbarhistory/public xpfe/components/urlbarhistory/src xpfe/components/build xpfe/components/history/public xpfe/components/history embedding/browser/webBrowser embedding/browser/build profile/pref-migrator profile xpfe/appshell xpfe/components/xremote/public xpfe/components/xremote widget/public widget/src view editor/composer/public intl/lwbrk content/xul/content content/xul/templates content/xul/document embedding/components/ui/helperAppDlg embedding/components/find embedding/components/commandhandler editor/txtsvc editor uriloader/prefetch docshell embedding/components/jsconsole/public embedding/base embedding/components/windowwatcher/src embedding/components/appstartup/src embedding/components/jsconsole/src embedding/components/printingui/src/unixshared embedding/components/build intl/chardet/public intl/chardet/src intl/uconv intl/locale accessible netwerk/protocol/viewsource netwerk/protocol/gopher netwerk/build2 sun-java modules/libjar js/src/liveconnect modules/oji other-licenses/libart_lgpl layout rdf/chrome/src rdf/chrome/build content gfx/src/xprintutil gfx/src/xlibrgb gfx jpeg modules/libpr0n netwerk intl/strres uriloader/exthandler modules/plugin caps dom extensions/cookie diff --git a/mozilla/configure.in b/mozilla/configure.in index ad30f5c1f78..fb8c14ab12e 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -4282,7 +4282,7 @@ MOZ_CALENDAR= MOZ_DBGRINFO_MODULES= MOZ_ENABLE_CANVAS=1 MOZ_ENABLE_LIBXUL= -MOZ_EXTENSIONS_ALL=" cookie wallet content-packs xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation reporter safe-browsing" +MOZ_EXTENSIONS_ALL=" cookie wallet xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation reporter safe-browsing" MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm icon" MOZ_IMG_ENCODERS_DEFAULT="png jpeg" MOZ_IPCD= @@ -4383,7 +4383,7 @@ suite) MOZ_SUITE=1 MOZ_PROFILESHARING= MOZ_APP_VERSION=$SEAMONKEY_VERSION - MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming permissions reporter" + MOZ_EXTENSIONS_DEFAULT=" cookie wallet xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming permissions reporter" AC_DEFINE(MOZ_SUITE) ;; diff --git a/mozilla/embedding/config/embed-jar.mn b/mozilla/embedding/config/embed-jar.mn index e6b5b471ee7..a7ef181335c 100644 --- a/mozilla/embedding/config/embed-jar.mn +++ b/mozilla/embedding/config/embed-jar.mn @@ -2,7 +2,7 @@ # needs to include. # # Format is: -# +# # , # # Use XXXX for locale specific parts of the path. @@ -52,7 +52,7 @@ locale/XXXX/global-platform, YYYY/locale/XXXX/global-plat locale/XXXX/global-platform/accessible.properties, XXXX/locale/XXXX/global-platform/accessible.properties locale/XXXX/communicator/layout, XXXX/locale/XXXX/communicator/layout locale/XXXX/forms, XXXX/locale/XXXX/forms -locale/US/global-region, US/locale/US/global-region +locale/XXXX/global-region, XXXX/locale/XXXX/global-region # Help stuff content/help, help/content/help, diff --git a/mozilla/embedding/config/installed-chrome.txt b/mozilla/embedding/config/installed-chrome.txt index a75e517f6d3..c3288a3e485 100644 --- a/mozilla/embedding/config/installed-chrome.txt +++ b/mozilla/embedding/config/installed-chrome.txt @@ -15,7 +15,7 @@ locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/forms/ skin,install,url,jar:resource:/chrome/embed.jar!/skin/classic/forms/ skin,install,select,classic/1.0 content,install,url,jar:resource:/chrome/embed.jar!/content/global-region/ -locale,install,url,jar:resource:/chrome/embed.jar!/locale/US/global-region/ +locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/global-region/ content,install,url,jar:resource:/chrome/embed.jar!/content/global-platform/ locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/global-platform/ content,install,url,jar:resource:/chrome/embed.jar!/content/cookie/ diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml index 7f052092a6a..242abc19e3a 100644 --- a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/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/extensions/help/resources/locale/en-US/help-index1.rdf b/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf index a427515d947..587c9ce47cc 100644 --- a/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf +++ b/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf @@ -1577,9 +1577,9 @@ nc:link="cs_nav_prefs_appearance.xhtml#colors"/> - + - + diff --git a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml index 2a7747df579..ec7f56d58fa 100644 --- a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml @@ -1186,27 +1186,7 @@ -

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/extensions/help/resources/locale/en-US/profiles_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml index c205525df73..e3571d2444c 100644 --- a/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/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/netwerk/test/jarlist.dat b/mozilla/netwerk/test/jarlist.dat index b4c59f93efe..32ebaa6cc8f 100644 --- a/mozilla/netwerk/test/jarlist.dat +++ b/mozilla/netwerk/test/jarlist.dat @@ -134,7 +134,7 @@ jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/contentAreaCommands. jar:resource:///chrome/en-US.jar!/locale/en-US/messenger/mailNavigatorOverlay.dtd jar:resource:///chrome/en-US.jar!/locale/en-US/messenger/mailOverlay.dtd jar:resource:///chrome/en-US.jar!/locale/en-US/editor/editorNavigatorOverlay.dtd -jar:resource:///chrome/US.jar!/locale/US/global-region/region.dtd +jar:resource:///chrome/en-US.jar!/locale/en-US/global-region/region.dtd jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/utilityOverlay.dtd jar:resource:///chrome/en-US.jar!/locale/en-US/help/helpMenuOverlay.dtd jar:resource:///chrome/en-win.jar!/locale/en-US/global-platform/platformGlobalOverlay.dtd @@ -209,7 +209,7 @@ jar:resource:///chrome/en-US.jar!/locale/en-US/necko/necko.properties jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/bookmarks/bookmarks.properties jar:resource:///chrome/en-win.jar!/locale/en-US/global-platform/platformKeys.properties jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/utilityOverlay.properties -jar:resource:///chrome/US.jar!/locale/US/navigator-region/region.properties +jar:resource:///chrome/en-US.jar!/locale/en-US/navigator-region/region.properties jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/viewZoomOverlay.properties -jar:resource:///chrome/US.jar!/locale/US/communicator-region/region.properties -jar:resource:///chrome/US.jar!/locale/US/global-region/builtinURLs.rdf +jar:resource:///chrome/en-US.jar!/locale/en-US/communicator-region/region.properties +jar:resource:///chrome/en-US.jar!/locale/en-US/global-region/builtinURLs.rdf diff --git a/mozilla/suite/Makefile.in b/mozilla/suite/Makefile.in index d7d955152bf..d6e4cd88ce8 100644 --- a/mozilla/suite/Makefile.in +++ b/mozilla/suite/Makefile.in @@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk DIRS = \ branding \ + common \ + locales \ $(NULL) # XXX Once SeaMonkey becomes a fully fledged xul app, we can remove diff --git a/mozilla/suite/common/Makefile.in b/mozilla/suite/common/Makefile.in new file mode 100644 index 00000000000..fde02500daf --- /dev/null +++ b/mozilla/suite/common/Makefile.in @@ -0,0 +1,45 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# 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. +# Portions created by the Initial Developer are Copyright (C) 2001 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Brian Ryner +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/suite/common/jar.mn b/mozilla/suite/common/jar.mn new file mode 100644 index 00000000000..a1c121c4591 --- /dev/null +++ b/mozilla/suite/common/jar.mn @@ -0,0 +1,7 @@ +comm.jar: +##ifdef MOZ_XUL_APP +#% content communicator %content/communicator/ xpcnativewrappers=yes +##else +#* content/communicator/contents.rdf (contents.rdf) +##endif + content/communicator/pref/pref-locales.xul (pref/pref-locales.xul) diff --git a/mozilla/suite/common/pref/pref-locales.xul b/mozilla/suite/common/pref/pref-locales.xul index 6e6439e1ec9..440c30fb165 100644 --- a/mozilla/suite/common/pref/pref-locales.xul +++ b/mozilla/suite/common/pref/pref-locales.xul @@ -20,8 +20,9 @@ the Initial Developer. All Rights Reserved. Contributor(s): - J.Betak - Josh Soref + J.Betak + Josh Soref + Robert Kaiser Alternatively, the contents of this file may be used under the terms of either the GNU General Public License Version 2 or later (the "GPL"), or @@ -41,35 +42,25 @@ + %brandDTD; - + %regionDTD; - -%prefContentDTD; + +%prefLocalesDTD; ]> + onload="parent.initPanel('chrome://communicator/content/pref/pref-locales.xul');" + headertitle="&pref.locales.title;"> - + &languageIntro.label; @@ -253,54 +232,6 @@ - - - &contentIntro.label; - - - - - - - - - -