зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
kairo%kairo.at
Родитель
67d8888615
Коммит
91acb7039c
|
|
@ -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" ;;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# needs to include.
|
||||
#
|
||||
# Format is:
|
||||
#
|
||||
#
|
||||
# <destination in embed.jar>,<source in unzipped chrome>
|
||||
#
|
||||
# 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,
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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'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
|
||||
content pack and/or language pack to use within &brandShortName;.</p>
|
||||
<p>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.</p>
|
||||
|
||||
<ul>
|
||||
<li><strong>Installed language packs</strong>: Select a language pack to use
|
||||
within &brandShortName;.</li>
|
||||
<li><strong>Installed content packs</strong>: Select a content pack to use
|
||||
<li><strong>Installed language packs</strong>: Select a language to use
|
||||
within &brandShortName;.</li>
|
||||
<li><strong>Uninstall</strong>: Click this to uninstall a selected language
|
||||
or content pack.</li>
|
||||
<li><strong>Download More</strong>: Click this to download more content or
|
||||
pack.</li>
|
||||
<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>
|
||||
|
||||
|
|
|
|||
|
|
@ -1577,9 +1577,9 @@
|
|||
nc:link="cs_nav_prefs_appearance.xhtml#colors"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="preferences:content_packs"
|
||||
nc:name="content packs preferences"
|
||||
nc:link="cs_nav_prefs_appearance.xhtml#languages_content"/>
|
||||
<rdf:Description ID="preferences:locales"
|
||||
nc:name="User Interface languages preferences"
|
||||
nc:link="cs_nav_prefs_appearance.xhtml#locales"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="preferences:cookies"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1186,27 +1186,7 @@
|
|||
</li>
|
||||
</ol>
|
||||
|
||||
<p>The content pack you use affects the home page, bookmarks, toolbar contents,
|
||||
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,
|
||||
<p><strong>Tip</strong>: To download more language packs,
|
||||
click Download More.</p>
|
||||
|
||||
<p>Web pages are sometimes available in several languages. &brandShortName;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Region Selection and choose the Language/Content set you want.</li>
|
||||
<li>If you have additional Language Packs installed, click
|
||||
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 © 2003-2005 The Mozilla Foundation.</p>
|
||||
<p>Copyright © 2003-2006 The Mozilla Foundation.</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <bryner@brianryner.com>
|
||||
#
|
||||
# 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
|
||||
|
|
@ -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)
|
||||
|
|
@ -20,8 +20,9 @@
|
|||
the Initial Developer. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
J.Betak <jbetak@netscape.com>
|
||||
Josh Soref <timeless@mac.com>
|
||||
J.Betak <jbetak@netscape.com>
|
||||
Josh Soref <timeless@mac.com>
|
||||
Robert Kaiser <kairo@kairo.at>
|
||||
|
||||
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 @@
|
|||
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE page [
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
|
||||
%brandDTD;
|
||||
<!ENTITY % regionDTD SYSTEM "chrome://global-region/locale/region.dtd" >
|
||||
<!ENTITY % regionDTD SYSTEM "chrome://global-region/locale/region.dtd">
|
||||
%regionDTD;
|
||||
<!ENTITY % prefContentDTD SYSTEM "chrome://content-packs/locale/pref-contentpacks.dtd" >
|
||||
%prefContentDTD;
|
||||
<!ENTITY % prefLocalesDTD SYSTEM "chrome://communicator/locale/pref/pref-locales.dtd">
|
||||
%prefLocalesDTD;
|
||||
]>
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="parent.initPanel('chrome://content-packs/content/pref-contentpacks.xul'); "
|
||||
headertitle="&pref.contentpacks.title;">
|
||||
onload="parent.initPanel('chrome://communicator/content/pref/pref-locales.xul');"
|
||||
headertitle="&pref.locales.title;">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["contentPackList", "languagePackList"];
|
||||
var _elementIDs = ["languagePackList"];
|
||||
|
||||
|
||||
function Startup()
|
||||
{
|
||||
var contentList = document.getElementById( "contentPackList" );
|
||||
var regionName = contentList.getAttribute("prefvalue");
|
||||
var regionElements = contentList.getElementsByAttribute("value", regionName);
|
||||
|
||||
if (regionElements.item(0)) {
|
||||
contentList.selectItem(regionElements.item(0));
|
||||
} else {
|
||||
contentList.selectedIndex = 0;
|
||||
}
|
||||
|
||||
var languageList = document.getElementById( "languagePackList" );
|
||||
var languageName = languageList.getAttribute("prefvalue");
|
||||
var languageElements = languageList.getElementsByAttribute("value", languageName);
|
||||
|
|
@ -85,22 +76,9 @@
|
|||
function SwitchPacks()
|
||||
{
|
||||
var shouldRemoveFaslFile = false;
|
||||
//Switch the Content pack if necessary
|
||||
var oldContentPack = parent.hPrefWindow.getPref( "localizedstring", "general.useragent.contentlocale");
|
||||
var newContentPack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://content-packs/content/pref-contentpacks.xul", "contentPackList" ).prefvalue;
|
||||
if (newContentPack && (newContentPack != oldContentPack))
|
||||
{
|
||||
try {
|
||||
parent.hPrefWindow.chromeRegistry.selectLocale(newContentPack, true);
|
||||
shouldRemoveFaslFile = true;
|
||||
parent.hPrefWindow.observerService.notifyObservers(null, "locale-selected", null);
|
||||
}
|
||||
catch(e) {}
|
||||
}
|
||||
|
||||
//Switch the Language pack if necessary
|
||||
var oldLanguagePack = parent.hPrefWindow.getPref( "localizedstring", "general.useragent.locale");
|
||||
var newLanguagePack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://content-packs/content/pref-contentpacks.xul", "languagePackList" ).prefvalue;
|
||||
var newLanguagePack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://communicator/content/pref/pref-locales.xul", "languagePackList" ).prefvalue;
|
||||
if (newLanguagePack && (newLanguagePack != oldLanguagePack))
|
||||
{
|
||||
try {
|
||||
|
|
@ -116,9 +94,10 @@
|
|||
// have the fastload file open at this moment, so the remove should succeed.
|
||||
// (XXX actually there is a small window where this is possible, in which
|
||||
// case we're screwed).
|
||||
// XXX This should really be done in the chrome registry itself, not be in
|
||||
// front-end code, but this patch is only to get this mostly working for 1.1b
|
||||
// The code below must die before 1.1final!!
|
||||
// XXX This should have really been done in the chrome registry itself,
|
||||
// not be in front-end code, but this patch was only to get this mostly
|
||||
// working for Mozilla 1.1b - see bug 142623
|
||||
// "The code below must die before [Mozilla] 1.1final!!" ;-)
|
||||
if (shouldRemoveFaslFile) {
|
||||
try {
|
||||
const XUL_FASTLOAD_FILE_BASENAME = "XUL";
|
||||
|
|
@ -186,7 +165,7 @@
|
|||
]]>
|
||||
</script>
|
||||
|
||||
<hbox class="box-smallheader" title="&pref.contentpacks.title;"/>
|
||||
<hbox class="box-smallheader" title="&pref.locales.title;"/>
|
||||
|
||||
<!-- Language pack listbox -->
|
||||
<description>&languageIntro.label;</description>
|
||||
|
|
@ -253,54 +232,6 @@
|
|||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<!-- Content (aka region) pack listbox -->
|
||||
<separator class="thin"/>
|
||||
<description>&contentIntro.label;</description>
|
||||
|
||||
<label control="contentPackList">&installedContentPacks.label;</label>
|
||||
<listbox id="contentPackList" flex="1" rows="3"
|
||||
ref="urn:mozilla:locale:root" datasources="rdf:chrome"
|
||||
sortResource="http://www.mozilla.org/rdf/chrome#name"
|
||||
preftype="localizedstring" prefstring="general.useragent.contentlocale"
|
||||
prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
|
||||
seltype="false"
|
||||
onselect="SelectPack('contentPackList', 'uninstallContentPack');"
|
||||
sortDirection="ascending">
|
||||
|
||||
<template xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
|
||||
|
||||
<!-- This rule displays only up to date content packs based on the localeVersion -->
|
||||
<rule chrome:localeType="region" chrome:localeVersion="&content.version;">
|
||||
<listitem uri="..." translation="true" nselected="false"
|
||||
label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
|
||||
value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
|
||||
</rule>
|
||||
|
||||
<!-- This rule "falls through" to match obsolete content packs -->
|
||||
<rule chrome:localeType="region">
|
||||
<listitem uri="..." translation="true" nselected="false" class="outofdate"
|
||||
label="rdf:http://www.mozilla.org/rdf/chrome#displayName &update.label;"
|
||||
value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
|
||||
</rule>
|
||||
|
||||
</template>
|
||||
</listbox>
|
||||
|
||||
<hbox>
|
||||
<vbox>
|
||||
<button id="uninstallContentPack"
|
||||
label="&uninstallContentPack.label;"
|
||||
accesskey="&uninstallContentPack.accesskey;"
|
||||
oncommand="UninstallPack('contentPackList')"/>
|
||||
</vbox>
|
||||
<vbox>
|
||||
<button id="downloadContentPacks"
|
||||
label="&downloadContentPacks.label;"
|
||||
accesskey="&downloadContentPacks.accesskey;"
|
||||
oncommand="DownloadRegionPacks()"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
<description>&restartOnLangChange.label;</description>
|
||||
<separator class="thin"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
# ***** 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 the Mozilla Browser code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Benjamin Smedberg <bsmedberg@covad.net>
|
||||
# Portions created by the Initial Developer are Copyright (C) 2004
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# 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@
|
||||
relativesrcdir = suite/locales
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DEFINES += -DAB_CD=$(AB_CD)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -1,16 +1,10 @@
|
|||
|
||||
<!ENTITY pref.contentpacks.title "Language and Content Packs">
|
||||
<!ENTITY contentIntro.label "Selecting a new content pack changes items in the Sidebar, and changes the default home page, certain bookmarks, and other items. You will not lose bookmarks and other items that you have customized when you switch content packs.">
|
||||
<!ENTITY languageIntro.label "Selecting a new language pack changes the language for text that appears in dialog boxes, menus, toolbars and button labels.">
|
||||
<!ENTITY restartOnLangChange.label "Changes to content or language packs take effect when you restart &brandShortName;.">
|
||||
<!ENTITY installedContentPacks.label "Installed content packs:">
|
||||
<!ENTITY installedLanguagePacks.label "Installed language packs:">
|
||||
<!ENTITY downloadContentPacks.label "Download More...">
|
||||
<!ENTITY downloadContentPacks.accesskey "w">
|
||||
<!ENTITY downloadLanguagePacks.label "Download More...">
|
||||
<!ENTITY pref.locales.title "User Interface Language">
|
||||
<!ENTITY languageIntro.label "From the list below you can select the language for text that appears in dialog boxes, menus, toolbars and button labels.">
|
||||
<!ENTITY restartOnLangChange.label "Language preferences will take effect when you restart &brandShortName;.">
|
||||
<!ENTITY installedLanguagePacks.label "Installed languages:">
|
||||
<!ENTITY downloadLanguagePacks.label "Download More...">
|
||||
<!ENTITY downloadLanguagePacks.accesskey "D">
|
||||
<!ENTITY update.label "(needs update)">
|
||||
<!ENTITY uninstallContentPack.accesskey "u">
|
||||
<!ENTITY uninstallContentPack.label "Uninstall">
|
||||
<!ENTITY uninstallLanguagePack.accesskey "n">
|
||||
<!ENTITY update.label "(needs update)">
|
||||
<!ENTITY uninstallLanguagePack.accesskey "U">
|
||||
<!ENTITY uninstallLanguagePack.label "Uninstall">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
##ifdef MOZ_XUL_APP
|
||||
#% locale communicator @AB_CD@ %locale/@AB_CD@/communicator/
|
||||
##else
|
||||
#* locale/@AB_CD@/communicator/contents.rdf (generic/chrome/common/contents.rdf)
|
||||
##endif
|
||||
locale/@AB_CD@/communicator/pref/pref-locales.dtd (%chrome/common/pref/pref-locales.dtd)
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -485,7 +485,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/cookie/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","content-packs.jar"), "content/content-packs/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-region/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/editor/");
|
||||
|
|
|
|||
|
|
@ -177,10 +177,9 @@ C2=Component PSM
|
|||
C3=Component Uninstaller
|
||||
C4=Component US English Profile Defaults
|
||||
C5=Component En US lang pack
|
||||
C6=Component US region pack
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
C7=Component QFA
|
||||
C6=Component QFA
|
||||
|
||||
[Setup Type1]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
@ -200,11 +199,10 @@ C5=Component Chatzilla
|
|||
C6=Component Venkman
|
||||
C7=Component US English Profile Defaults
|
||||
C8=Component En US lang pack
|
||||
C9=Component US region pack
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
C10=Component DOM Inspector
|
||||
C11=Component QFA
|
||||
C9=Component DOM Inspector
|
||||
C10=Component QFA
|
||||
|
||||
[Setup Type2]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
@ -226,11 +224,10 @@ C5=Component Chatzilla
|
|||
C6=Component Venkman
|
||||
C7=Component US English Profile Defaults
|
||||
C8=Component En US lang pack
|
||||
C9=Component US region pack
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
C10=Component DOM Inspector
|
||||
C11=Component QFA
|
||||
C9=Component DOM Inspector
|
||||
C10=Component QFA
|
||||
|
||||
|
||||
|
||||
|
|
@ -621,18 +618,6 @@ $InstallSizeArchive$:langenus.xpi
|
|||
Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
|
||||
Force Upgrade File0=[SETUP PATH]\Chrome\en-US.jar
|
||||
|
||||
[Component US region pack]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
Description Short=US region pack
|
||||
;*** LOCALIZE ME BABY ***
|
||||
Description Long=Regional content for US users
|
||||
Archive=regus.xpi
|
||||
$InstallSize$:regus
|
||||
$InstallSizeSystem$
|
||||
$InstallSizeArchive$:regus.xpi
|
||||
Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
|
||||
Force Upgrade File0=[SETUP PATH]\Chrome\US.jar
|
||||
|
||||
[Component QFA]
|
||||
Description Short=Quality Feedback Agent
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ if (verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/cookie/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/wallet/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"content-packs.jar"),"content/content-packs/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator/");
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ if (verifyDiskSpace(fProgram, srDest))
|
|||
|
||||
registerChrome(chromeType, cf, localeName + "global/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator/");
|
||||
registerChrome(chromeType, cf, localeName + "branding/");
|
||||
|
||||
registerChrome(chromeType, cf, localeName + "messenger/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-smime/");
|
||||
|
|
@ -67,12 +68,17 @@ if (verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(chromeType, cf, localeName + "autoconfig/");
|
||||
registerChrome(chromeType, cf, localeName + "cookie/");
|
||||
registerChrome(chromeType, cf, localeName + "wallet/");
|
||||
registerChrome(chromeType, cf, localeName + "content-packs/");
|
||||
registerChrome(chromeType, cf, localeName + "help/");
|
||||
registerChrome(chromeType, cf, localeName + "pippki/");
|
||||
registerChrome(chromeType, cf, localeName + "pipnss/");
|
||||
registerChrome(chromeType, cf, localeName + "p3p/");
|
||||
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
registerChrome(chromeType, pf, localeName + "global-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "communicator-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "navigator-platform/");
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
var srDest = $SpaceRequired$;
|
||||
|
||||
var err;
|
||||
var fProgram;
|
||||
|
||||
// --- LOCALIZATION NOTE: translate only these ---
|
||||
var prettyName = "US Region Pack";
|
||||
var chromeNode = "US";
|
||||
// --- END LOCALIZABLE RESOURCES ---
|
||||
var regName = "locales/mozilla/" + chromeNode;
|
||||
var chromeName = chromeNode + ".jar";
|
||||
var localeName = "locale/" + chromeNode + "/";
|
||||
|
||||
err = initInstall(prettyName, regName, "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
fProgram = getFolder("Program");
|
||||
logComment("fProgram: " + fProgram);
|
||||
|
||||
if (verifyDiskSpace(fProgram, srDest))
|
||||
{
|
||||
var chromeType = LOCALE;
|
||||
err = addDirectory("",
|
||||
"viewer",
|
||||
fProgram,
|
||||
"");
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
if (err != SUCCESS)
|
||||
{
|
||||
logComment("addDirectory() to " + fProgram + "failed!");
|
||||
// couldn't install globally, try installing to the profile
|
||||
resetError();
|
||||
chromeType |= PROFILE_CHROME;
|
||||
fProgram = getFolder("Profile");
|
||||
logComment("try installing to the profile: " + fProgram);
|
||||
err = addDirectory("","viewer/chrome",fProgram,"chrome");
|
||||
}
|
||||
|
||||
setPackageFolder(fProgram);
|
||||
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
// register chrome
|
||||
var cf = getFolder(fProgram, "chrome/"+ chromeName);
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
err = performInstall();
|
||||
logComment("performInstall() returned: " + err);
|
||||
}
|
||||
else
|
||||
{
|
||||
cancelInstall(err);
|
||||
logComment("cancelInstall due to error: " + err);
|
||||
}
|
||||
}
|
||||
else
|
||||
cancelInstall(INSUFFICIENT_DISK_SPACE);
|
||||
|
|
@ -193,7 +193,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/cookie/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","content-packs.jar"), "content/content-packs/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator/downloadmanager/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-region/");
|
||||
|
|
|
|||
|
|
@ -148,11 +148,10 @@ C1=Component Navigator
|
|||
C2=Component PSM
|
||||
C3=Component US English Profile Defaults
|
||||
C4=Component En US lang pack
|
||||
C5=Component US region pack
|
||||
C6=Component Uninstaller
|
||||
C5=Component Uninstaller
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
;C7=Component QFA
|
||||
;C6=Component QFA
|
||||
|
||||
[Setup Type1]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
@ -172,13 +171,12 @@ C5=Component Chatzilla
|
|||
C6=Component Venkman
|
||||
C7=Component US English Profile Defaults
|
||||
C8=Component En US lang pack
|
||||
C9=Component US region pack
|
||||
C10=Component DOM Inspector
|
||||
C11=Component Uninstaller
|
||||
C9=Component DOM Inspector
|
||||
C10=Component Uninstaller
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
;C12=Component QFA
|
||||
C12=Component RPT
|
||||
;C11=Component QFA
|
||||
C11=Component RPT
|
||||
|
||||
[Setup Type2]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
@ -200,13 +198,12 @@ C5=Component Chatzilla
|
|||
C6=Component Venkman
|
||||
C7=Component US English Profile Defaults
|
||||
C8=Component En US lang pack
|
||||
C9=Component US region pack
|
||||
C10=Component DOM Inspector
|
||||
C11=Component Uninstaller
|
||||
C9=Component DOM Inspector
|
||||
C10=Component Uninstaller
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
;C12=Component QFA
|
||||
C12=Component RPT
|
||||
;C11=Component QFA
|
||||
C11=Component RPT
|
||||
|
||||
|
||||
|
||||
|
|
@ -545,17 +542,6 @@ $InstallSizeArchive$:langenus.xpi
|
|||
Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
|
||||
Force Upgrade File0=[SETUP PATH]\Chrome\en-US.jar
|
||||
|
||||
[Component US region pack]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
Description Short=US region pack
|
||||
;*** LOCALIZE ME BABY ***
|
||||
Description Long=Regional content for US users
|
||||
Archive=regus.xpi
|
||||
$InstallSize$:regus
|
||||
$InstallSizeArchive$:regus.xpi
|
||||
Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
|
||||
Force Upgrade File0=[SETUP PATH]\Chrome\US.jar
|
||||
|
||||
[Component PSM]
|
||||
Description Short=Personal Security Manager
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
var srDest;
|
||||
var err;
|
||||
var fProgram;
|
||||
var platformNode;
|
||||
|
||||
platformNode = getPlatform();
|
||||
var platformNode = getPlatform();
|
||||
/* BEGIN TEMPORARY UNTIL xpinstall/packager/common/share.t is fixed*/
|
||||
platformNode = "win";
|
||||
/* END TEMPORARY */
|
||||
|
|
@ -72,12 +71,17 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(chromeType, cf, localeName + "autoconfig/");
|
||||
registerChrome(chromeType, cf, localeName + "cookie/");
|
||||
registerChrome(chromeType, cf, localeName + "wallet/");
|
||||
registerChrome(chromeType, cf, localeName + "content-packs/");
|
||||
registerChrome(chromeType, cf, localeName + "help/");
|
||||
registerChrome(chromeType, cf, localeName + "pippki/");
|
||||
registerChrome(chromeType, cf, localeName + "pipnss/");
|
||||
registerChrome(chromeType, cf, localeName + "p3p/");
|
||||
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
registerChrome(chromeType, pf, localeName + "global-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "communicator-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "navigator-platform/");
|
||||
|
|
|
|||
|
|
@ -1,98 +0,0 @@
|
|||
// main
|
||||
var srDest;
|
||||
var err;
|
||||
var fProgram;
|
||||
var searchPlugins = "searchplugins";
|
||||
var platformNode = getPlatform();
|
||||
/* BEGIN TEMPORARY UNTIL xpinstall/packager/common/share.t is fixed*/
|
||||
platformNode = "win";
|
||||
/* END TEMPORARY */
|
||||
|
||||
// ----LOCALIZATION NOTE: translate only these ------
|
||||
var prettyName = "US Region Pack";
|
||||
var chromeNode = "US";
|
||||
// --- END CHANGABLE STUFF ---
|
||||
|
||||
var regName = "locales/mozilla/" + chromeNode;
|
||||
var chromeName = chromeNode + ".jar";
|
||||
var localeName = "locale/" + chromeNode + "/";
|
||||
|
||||
srDest = $SpaceRequired$:bin;
|
||||
err = initInstall(prettyName, regName, "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
if (platformNode == 'mac')
|
||||
{
|
||||
searchPlugins = "Search Plugins";
|
||||
}
|
||||
|
||||
fProgram = getFolder("Program");
|
||||
logComment("fProgram: " + fProgram);
|
||||
|
||||
if(verifyDiskSpace(fProgram, srDest))
|
||||
{
|
||||
var chromeType = LOCALE;
|
||||
var fTarget;
|
||||
|
||||
setPackageFolder(fProgram);
|
||||
|
||||
fTarget = getFolder("Chrome");
|
||||
err = addDirectory("",
|
||||
"bin/chrome", // dir name in jar to extract
|
||||
fTarget, // Where to put this file (Returned from GetFolder)
|
||||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
fTarget = getFolder("Program", "defaults");
|
||||
logComment("fTarget: " + fTarget);
|
||||
err = addDirectory("",
|
||||
"bin/defaults", // dir name in jar to extract
|
||||
fTarget, // Where to put this file (Returned from GetFolder)
|
||||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
fTarget = getFolder("Program", searchPlugins);
|
||||
logComment("fTarget: " + fTarget);
|
||||
err = addDirectory("",
|
||||
"bin/searchplugins", // dir name in jar to extract
|
||||
fTarget, // Where to put this file (Returned from GetFolder)
|
||||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
}
|
||||
}
|
||||
if (err != SUCCESS)
|
||||
{
|
||||
logComment("addDirectory() to " + fProgram + "failed!");
|
||||
// couldn't install globally, try installing to the profile
|
||||
resetError();
|
||||
chromeType |= PROFILE_CHROME;
|
||||
fProgram = getFolder("Profile");
|
||||
logComment("try installing to the profile: " + fProgram);
|
||||
err = addDirectory("","bin/chrome",fProgram,"chrome");
|
||||
}
|
||||
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
// register chrome
|
||||
var cf = getFolder(fProgram, "chrome/"+ chromeName);
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
err = performInstall();
|
||||
logComment("performInstall() returned: " + err);
|
||||
}
|
||||
else
|
||||
{
|
||||
cancelInstall(err);
|
||||
logComment("cancelInstall due to error: " + err);
|
||||
}
|
||||
}
|
||||
else
|
||||
cancelInstall(INSUFFICIENT_DISK_SPACE);
|
||||
|
||||
// end main
|
||||
|
|
@ -14,23 +14,18 @@ bin/.autoreg
|
|||
[langenus]
|
||||
;
|
||||
; en-US
|
||||
; If you add a new directory you must explicitly call addDirectory in langenus.jst
|
||||
bin/chrome/en-US.jar
|
||||
bin/chrome/en-mac.jar
|
||||
bin/chrome/en-unix.jar
|
||||
bin/chrome/en-win.jar
|
||||
|
||||
[regus]
|
||||
;
|
||||
; US
|
||||
; If you add a new directory you must explicitly call addDirectory in regus.jst
|
||||
bin/chrome/US.jar
|
||||
bin/defaults/profile/US/*
|
||||
bin/defaults/messenger/US/*
|
||||
bin/defaults/profile/en-US/*
|
||||
bin/defaults/messenger/en-US/*
|
||||
bin/searchplugins/*
|
||||
|
||||
[deflenus]
|
||||
;
|
||||
; default files for US
|
||||
; default files for en-US
|
||||
bin/defaults/profile/bookmarks.html
|
||||
bin/defaults/profile/panels.rdf
|
||||
bin/defaults/profile/localstore.rdf
|
||||
|
|
@ -306,7 +301,6 @@ bin/components/p3p.dll
|
|||
; chrome stuff
|
||||
bin/chrome/help.jar
|
||||
bin/chrome/comm.jar
|
||||
bin/chrome/content-packs.jar
|
||||
bin/chrome/toolkit.jar
|
||||
bin/chrome/modern.jar
|
||||
bin/chrome/classic.jar
|
||||
|
|
|
|||
|
|
@ -16,19 +16,14 @@ bin/.autoreg
|
|||
bin/chrome/en-US.jar
|
||||
bin/chrome/en-unix.jar
|
||||
bin/chrome/en-win.jar
|
||||
|
||||
[regus]
|
||||
;
|
||||
; US
|
||||
bin/chrome/US.jar
|
||||
bin/defaults/profile/US/*
|
||||
bin/defaults/messenger/US/*
|
||||
bin/defaults/isp/US/movemail.rdf
|
||||
bin/defaults/profile/en-US/*
|
||||
bin/defaults/messenger/en-US/*
|
||||
bin/defaults/isp/en-US/movemail.rdf
|
||||
bin/searchplugins/*
|
||||
|
||||
[deflenus]
|
||||
;
|
||||
; default files for US
|
||||
; default files for en-US
|
||||
bin/defaults/profile/bookmarks.html
|
||||
bin/defaults/profile/panels.rdf
|
||||
bin/defaults/profile/localstore.rdf
|
||||
|
|
@ -212,7 +207,6 @@ bin/copmonents/imgicon.xpt
|
|||
bin/chrome/help.jar
|
||||
bin/chrome/toolkit.jar
|
||||
bin/chrome/comm.jar
|
||||
bin/chrome/content-packs.jar
|
||||
bin/chrome/modern.jar
|
||||
bin/chrome/classic.jar
|
||||
bin/chrome/installed-chrome.txt
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ bin/.autoreg
|
|||
[langenus]
|
||||
;
|
||||
; en-US
|
||||
; If you add a new directory you must explicitly call addDirectory in langenus.jst
|
||||
bin\chrome\en-US.jar
|
||||
bin\chrome\en-mac.jar
|
||||
bin\chrome\en-unix.jar
|
||||
|
|
@ -21,20 +22,13 @@ bin\chrome\en-US\*
|
|||
bin\chrome\en-win\*
|
||||
bin\chrome\en-unix\*
|
||||
bin\chrome\en-mac\*
|
||||
|
||||
[regus]
|
||||
;
|
||||
; US
|
||||
; If you add a new directory you must explicitly call addDirectory in regus.jst
|
||||
bin\chrome\US.jar
|
||||
bin\chrome\US\*
|
||||
bin\defaults\profile\US\*
|
||||
bin\defaults\messenger\US\*
|
||||
bin\defaults\profile\en-US\*
|
||||
bin\defaults\messenger\en-US\*
|
||||
bin\searchplugins\*
|
||||
|
||||
[deflenus]
|
||||
;
|
||||
; default files for US
|
||||
; default files for en-US
|
||||
bin\defaults\profile\bookmarks.html
|
||||
bin\defaults\profile\panels.rdf
|
||||
bin\defaults\profile\localstore.rdf
|
||||
|
|
|
|||
|
|
@ -17,19 +17,14 @@ bin/chrome/en-US.jar
|
|||
bin/chrome/en-mac.jar
|
||||
bin/chrome/en-unix.jar
|
||||
bin/chrome/en-win.jar
|
||||
|
||||
[regus]
|
||||
;
|
||||
; US
|
||||
bin/chrome/US.jar
|
||||
bin/defaults/profile/US/*
|
||||
bin/defaults/messenger/US/*
|
||||
bin/defaults/isp/US/movemail.rdf
|
||||
bin/defaults/profile/en-US/*
|
||||
bin/defaults/messenger/en-US/*
|
||||
bin/defaults/isp/en-US/movemail.rdf
|
||||
bin/searchplugins/*
|
||||
|
||||
[deflenus]
|
||||
;
|
||||
; default files for US
|
||||
; default files for en-US
|
||||
bin/defaults/profile/bookmarks.html
|
||||
bin/defaults/profile/panels.rdf
|
||||
bin/defaults/profile/localstore.rdf
|
||||
|
|
@ -304,7 +299,6 @@ bin/components/libp3p.so
|
|||
bin/chrome/help.jar
|
||||
bin/chrome/toolkit.jar
|
||||
bin/chrome/comm.jar
|
||||
bin/chrome/content-packs.jar
|
||||
bin/chrome/modern.jar
|
||||
bin/chrome/classic.jar
|
||||
bin/chrome/installed-chrome.txt
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ bin/.autoreg
|
|||
[langenus]
|
||||
;
|
||||
; en-US
|
||||
; If you add a new directory you must explicitly call addDirectory in langenus.jst
|
||||
bin\chrome\en-US.jar
|
||||
bin\chrome\en-mac.jar
|
||||
bin\chrome\en-unix.jar
|
||||
|
|
@ -39,20 +40,14 @@ bin\chrome\en-US\*
|
|||
bin\chrome\en-win\*
|
||||
bin\chrome\en-unix\*
|
||||
bin\chrome\en-mac\*
|
||||
|
||||
[regus]
|
||||
;
|
||||
; US
|
||||
; If you add a new directory you must explicitly call addDirectory in regus.jst
|
||||
bin\chrome\US.jar
|
||||
bin\chrome\US\*
|
||||
bin\defaults\profile\US\*
|
||||
bin\defaults\messenger\US\*
|
||||
bin\chrome\en-US\*
|
||||
bin\defaults\profile\en-US\*
|
||||
bin\defaults\messenger\en-US\*
|
||||
bin\searchplugins\*
|
||||
|
||||
[deflenus]
|
||||
;
|
||||
; default files for US
|
||||
; default files for en-US
|
||||
bin\defaults\profile\bookmarks.html
|
||||
bin\defaults\profile\panels.rdf
|
||||
bin\defaults\profile\localstore.rdf
|
||||
|
|
@ -195,7 +190,6 @@ bin\chrome\pippki.jar
|
|||
; chrome stuff
|
||||
bin\chrome\help.jar
|
||||
bin\chrome\comm.jar
|
||||
bin\chrome\content-packs.jar
|
||||
bin\chrome\toolkit.jar
|
||||
bin\chrome\modern.jar
|
||||
bin\chrome\classic.jar
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ if (verifyDiskSpace(communicatorFolder, srDest))
|
|||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/cookie/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/wallet/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"content-packs.jar"),"content/content-packs/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator/downloadmanager/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/branding/");
|
||||
|
|
|
|||
|
|
@ -51,9 +51,8 @@ C2=Component2
|
|||
C3=Component3
|
||||
C4=Component5
|
||||
C5=Component6
|
||||
C6=Component7
|
||||
C7=Component10
|
||||
C8=Component12
|
||||
C6=Component9
|
||||
C7=Component11
|
||||
|
||||
[Setup Type1]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
|
|
@ -72,7 +71,6 @@ C8=Component8
|
|||
C9=Component9
|
||||
C10=Component10
|
||||
C11=Component11
|
||||
C12=Component12
|
||||
|
||||
[Setup Type2]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
|
|
@ -84,8 +82,7 @@ C1=Component1
|
|||
C2=Component3
|
||||
C3=Component5
|
||||
C4=Component6
|
||||
C5=Component7
|
||||
C6=Component12
|
||||
C5=Component11
|
||||
|
||||
[Setup Type3]
|
||||
; *** LOCALIZE ME BABY ***
|
||||
|
|
@ -104,7 +101,6 @@ C8=Component8
|
|||
C9=Component9
|
||||
C10=Component10
|
||||
C11=Component11
|
||||
C12=Component12
|
||||
|
||||
|
||||
;-------------------------------------------------------------------------
|
||||
|
|
@ -185,16 +181,6 @@ Attributes=SELECTED|INVISIBLE
|
|||
URL0=$URLPath$
|
||||
|
||||
[Component7]
|
||||
Description Short=US Regional Pack
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Regional contents for US users
|
||||
Archive=regus.xpi
|
||||
$InstallSize$:regus
|
||||
$InstallSizeArchive$:regus.xpi
|
||||
Attributes=SELECTED|INVISIBLE
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component8]
|
||||
Description Short=Debugger
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for debugging JavaScript
|
||||
|
|
@ -204,7 +190,7 @@ $InstallSizeArchive$:venkman.xpi
|
|||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component9]
|
||||
[Component8]
|
||||
Description Short=Inspector
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=DOM Inspector
|
||||
|
|
@ -214,7 +200,7 @@ $InstallSizeArchive$:inspector.xpi
|
|||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component10]
|
||||
[Component9]
|
||||
Description Short=Spellchecker
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Spellchecker
|
||||
|
|
@ -224,7 +210,7 @@ $InstallSizeArchive$:spellcheck.xpi
|
|||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component11]
|
||||
[Component10]
|
||||
Description Short=Website Reporter
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=Website Reporter
|
||||
|
|
@ -234,7 +220,7 @@ $InstallSizeArchive$:reporter.xpi
|
|||
Attributes=SELECTED
|
||||
URL0=$URLPath$
|
||||
|
||||
[Component12]
|
||||
[Component11]
|
||||
Description Short=Quality Feedback Agent
|
||||
; *** LOCALIZE ME BABY ***
|
||||
Description Long=for reporting $AppDisplayName$ crash information
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
var srDest = $SpaceRequired$;
|
||||
var err;
|
||||
var fProgram;
|
||||
var platformNode;
|
||||
|
||||
platformNode = getPlatform();
|
||||
var platformNode = getPlatform();
|
||||
logComment("initInstall: platformNode=" + platformNode);
|
||||
// end
|
||||
// end - OS type detection
|
||||
|
|
@ -28,9 +27,9 @@ if (verifyDiskSpace(fProgram, srDest))
|
|||
{
|
||||
var chromeType = LOCALE;
|
||||
err = addDirectory("",
|
||||
"bin",
|
||||
fProgram,
|
||||
"");
|
||||
"bin", // dir name in jar to extract
|
||||
fProgram, // Where to put this file (Returned from GetFolder)
|
||||
""); // Force Flag
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
if (err != SUCCESS)
|
||||
|
|
@ -67,12 +66,17 @@ if (verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(chromeType, cf, localeName + "autoconfig/");
|
||||
registerChrome(chromeType, cf, localeName + "cookie/");
|
||||
registerChrome(chromeType, cf, localeName + "wallet/");
|
||||
registerChrome(chromeType, cf, localeName + "content-packs/");
|
||||
registerChrome(chromeType, cf, localeName + "help/");
|
||||
registerChrome(chromeType, cf, localeName + "pipnss/");
|
||||
registerChrome(chromeType, cf, localeName + "pippki/");
|
||||
registerChrome(chromeType, cf, localeName + "pipnss/");
|
||||
registerChrome(chromeType, cf, localeName + "p3p/");
|
||||
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
registerChrome(chromeType, pf, localeName + "global-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "communicator-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "navigator-platform/");
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
var srDest = $SpaceRequired$;
|
||||
var err;
|
||||
var fProgram;
|
||||
|
||||
// --- LOCALIZATION NOTE: translate only these ---
|
||||
var prettyName = "US Regional Pack";
|
||||
var chromeNode = "US";
|
||||
// --- END LOCALIZABLE RESOURCES ---
|
||||
var regName = "locales/mozilla/" + chromeNode;
|
||||
var chromeName = chromeNode + ".jar";
|
||||
var localeName = "locale/" + chromeNode + "/";
|
||||
|
||||
err = initInstall(prettyName, regName, "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
fProgram = getFolder("Program");
|
||||
logComment("fProgram: " + fProgram);
|
||||
|
||||
if (verifyDiskSpace(fProgram, srDest))
|
||||
{
|
||||
var chromeType = LOCALE;
|
||||
err = addDirectory("",
|
||||
"bin",
|
||||
fProgram,
|
||||
"");
|
||||
logComment("addDirectory() returned: " + err);
|
||||
|
||||
if (err != SUCCESS)
|
||||
{
|
||||
logComment("addDirectory() to " + fProgram + "failed!");
|
||||
// couldn't install globally, try installing to the profile
|
||||
resetError();
|
||||
chromeType |= PROFILE_CHROME;
|
||||
fProgram = getFolder("Profile");
|
||||
logComment("try installing to the profile: " + fProgram);
|
||||
err = addDirectory("","bin/chrome",fProgram,"chrome");
|
||||
}
|
||||
|
||||
setPackageFolder(fProgram);
|
||||
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
// register chrome
|
||||
var cf = getFolder(fProgram, "chrome/"+ chromeName);
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
err = performInstall();
|
||||
logComment("performInstall() returned: " + err);
|
||||
}
|
||||
else
|
||||
{
|
||||
cancelInstall(err);
|
||||
logComment("cancelInstall due to error: " + err);
|
||||
}
|
||||
}
|
||||
else
|
||||
cancelInstall(INSUFFICIENT_DISK_SPACE);
|
||||
|
|
@ -663,7 +663,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/cookie/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","content-packs.jar"), "content/content-packs/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator/downloadmanager/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/communicator-region/");
|
||||
|
|
|
|||
|
|
@ -254,13 +254,12 @@ C6=Component Chatzilla
|
|||
C7=Component Venkman
|
||||
C8=Component US English Profile Defaults
|
||||
C9=Component En US lang pack
|
||||
C10=Component US region pack
|
||||
C11=Component DOM Inspector
|
||||
C12=Component SRoaming
|
||||
C13=Component RPT
|
||||
C10=Component DOM Inspector
|
||||
C11=Component SRoaming
|
||||
C12=Component RPT
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
C14=Component QFA
|
||||
C13=Component QFA
|
||||
|
||||
[Setup Type2]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
@ -283,13 +282,12 @@ C6=Component Chatzilla
|
|||
C7=Component Venkman
|
||||
C8=Component US English Profile Defaults
|
||||
C9=Component En US lang pack
|
||||
C10=Component US region pack
|
||||
C11=Component DOM Inspector
|
||||
C12=Component SRoaming
|
||||
C13=Component RPT
|
||||
C10=Component DOM Inspector
|
||||
C11=Component SRoaming
|
||||
C12=Component RPT
|
||||
; Make sure Component QFA is LAST so 3rd party developers who might not want
|
||||
; this component can easily remove it.
|
||||
C14=Component QFA
|
||||
C13=Component QFA
|
||||
|
||||
|
||||
|
||||
|
|
@ -749,18 +747,6 @@ $InstallSizeArchive$:langenus.xpi
|
|||
Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
|
||||
Force Upgrade File0=[SETUP PATH]\chrome\en-US.jar
|
||||
|
||||
[Component US region pack]
|
||||
;*** LOCALIZE ME BABY ***
|
||||
Description Short=US region pack
|
||||
;*** LOCALIZE ME BABY ***
|
||||
Description Long=Regional content for US users
|
||||
Archive=regus.xpi
|
||||
$InstallSize$:regus
|
||||
$InstallSizeSystem$
|
||||
$InstallSizeArchive$:regus.xpi
|
||||
Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
|
||||
Force Upgrade File0=[SETUP PATH]\chrome\US.jar
|
||||
|
||||
[Component QFA]
|
||||
Description Short=Quality Feedback Agent
|
||||
;*** LOCALIZE ME BABY ***
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
var srDest;
|
||||
var err;
|
||||
var fProgram;
|
||||
var platformNode;
|
||||
|
||||
platformNode = getPlatform();
|
||||
var platformNode = getPlatform();
|
||||
logComment("initInstall: platformNode=" + platformNode);
|
||||
// end
|
||||
// end - OS type detection
|
||||
|
|
@ -69,12 +68,17 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
registerChrome(chromeType, cf, localeName + "autoconfig/");
|
||||
registerChrome(chromeType, cf, localeName + "cookie/");
|
||||
registerChrome(chromeType, cf, localeName + "wallet/");
|
||||
registerChrome(chromeType, cf, localeName + "content-packs/");
|
||||
registerChrome(chromeType, cf, localeName + "help/");
|
||||
registerChrome(chromeType, cf, localeName + "pippki/");
|
||||
registerChrome(chromeType, cf, localeName + "pipnss/");
|
||||
registerChrome(chromeType, cf, localeName + "p3p/");
|
||||
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
registerChrome(chromeType, pf, localeName + "global-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "communicator-platform/");
|
||||
registerChrome(chromeType, pf, localeName + "navigator-platform/");
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
// main
|
||||
var srDest;
|
||||
var err;
|
||||
var fProgram;
|
||||
var searchPlugins = "searchplugins";
|
||||
var platformNode = getPlatform();
|
||||
|
||||
// ----LOCALIZATION NOTE: translate only these ------
|
||||
var prettyName = "US Region Pack";
|
||||
var chromeNode = "US";
|
||||
// --- END CHANGABLE STUFF ---
|
||||
|
||||
var regName = "locales/mozilla/" + chromeNode;
|
||||
var chromeName = chromeNode + ".jar";
|
||||
var localeName = "locale/" + chromeNode + "/";
|
||||
|
||||
srDest = $SpaceRequired$:bin;
|
||||
err = initInstall(prettyName, regName, "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
if (platformNode == 'mac')
|
||||
{
|
||||
searchPlugins = "Search Plugins";
|
||||
}
|
||||
|
||||
fProgram = getFolder("Program");
|
||||
logComment("fProgram: " + fProgram);
|
||||
|
||||
if(verifyDiskSpace(fProgram, srDest))
|
||||
{
|
||||
var chromeType = LOCALE;
|
||||
var fTarget;
|
||||
|
||||
setPackageFolder(fProgram);
|
||||
|
||||
fTarget = getFolder("Chrome");
|
||||
err = addDirectory("",
|
||||
"bin/chrome", // dir name in jar to extract
|
||||
fTarget, // Where to put this file (Returned from GetFolder)
|
||||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
fTarget = getFolder("Program", "defaults");
|
||||
logComment("fTarget: " + fTarget);
|
||||
err = addDirectory("",
|
||||
"bin/defaults", // dir name in jar to extract
|
||||
fTarget, // Where to put this file (Returned from GetFolder)
|
||||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
fTarget = getFolder("Program", searchPlugins);
|
||||
logComment("fTarget: " + fTarget);
|
||||
err = addDirectory("",
|
||||
"bin/searchplugins", // dir name in jar to extract
|
||||
fTarget, // Where to put this file (Returned from GetFolder)
|
||||
""); // subdir name to create relative to fProgram
|
||||
logComment("addDirectory() returned: " + err);
|
||||
}
|
||||
}
|
||||
if (err != SUCCESS)
|
||||
{
|
||||
logComment("addDirectory() to " + fProgram + "failed!");
|
||||
// couldn't install globally, try installing to the profile
|
||||
resetError();
|
||||
chromeType |= PROFILE_CHROME;
|
||||
fProgram = getFolder("Profile");
|
||||
logComment("try installing to the profile: " + fProgram);
|
||||
err = addDirectory("","bin/chrome",fProgram,"chrome");
|
||||
}
|
||||
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
// register chrome
|
||||
var cf = getFolder(fProgram, "chrome/"+ chromeName);
|
||||
registerChrome(chromeType, cf, localeName + "global-region/");
|
||||
registerChrome(chromeType, cf, localeName + "communicator-region/");
|
||||
registerChrome(chromeType, cf, localeName + "editor-region/");
|
||||
registerChrome(chromeType, cf, localeName + "messenger-region/");
|
||||
registerChrome(chromeType, cf, localeName + "navigator-region/");
|
||||
|
||||
err = performInstall();
|
||||
logComment("performInstall() returned: " + err);
|
||||
}
|
||||
else
|
||||
{
|
||||
cancelInstall(err);
|
||||
logComment("cancelInstall due to error: " + err);
|
||||
}
|
||||
}
|
||||
else
|
||||
cancelInstall(INSUFFICIENT_DISK_SPACE);
|
||||
|
||||
// end main
|
||||
Загрузка…
Ссылка в новой задаче