mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

62171: "Separate content from UI". Split langenus.xpi into regus.xpi. 

browser: (r=pchen,sr=alecf), mailnews: (r=yamamoto,sr=sspitzer),
editor: (r=cmonske,sr=sfraser), xpinstall (r=ssu,sr=dveditz).
This commit is contained in:
tao%netscape.com 2001-02-23 08:34:10 +00:00
Родитель 59e6a1c698
Коммит 9485f2f1b3
82 изменённых файлов: 693 добавлений и 182 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
build/mac/build_scripts/MozillaBuildList.pm
Просмотреть файл

@ -120,10 +120,10 @@ sub InstallDefaultsFiles()
InstallResources(":mozilla:profile:defaults:MANIFEST", "$default_profile_dir", 1);
# make a dup in en-US
my($default_profile_dir_en_US) = "$default_profile_dir"."en-US:";
mkdir($default_profile_dir_en_US, 0);
my($default_profile_dir_US) = "$default_profile_dir"."US:";
mkdir($default_profile_dir_US, 0);
InstallResources(":mozilla:profile:defaults:MANIFEST", "$default_profile_dir_en_US", 1);
InstallResources(":mozilla:profile:defaults:MANIFEST", "$default_profile_dir_US", 1);
}
# Default _pref_ directory stuff

2
editor/Makefile.in
Просмотреть файл

@ -32,4 +32,6 @@ include $(topsrcdir)/config/rules.mk
chrome::
@$(REGCHROME) content editor comm.jar
@$(REGCHROME) content editor-region comm.jar
@$(REGCHROME) locale en-US/editor en-US.jar
@$(REGCHROME) locale US/editor-region US.jar

4
editor/jar.mn
Просмотреть файл

@ -1,5 +1,6 @@
comm.jar:
content/editor/contents.rdf (ui/composer/content/contents.rdf)
content/editor-region/contents.rdf (ui/composer/content/contents-region.rdf)
content/editor/editor.xul (ui/composer/content/editor.xul)
content/editor/TextEditorAppShell.xul (ui/composer/content/TextEditorAppShell.xul)
content/editor/editor.js (ui/composer/content/editor.js)
@ -210,3 +211,6 @@ en-US.jar:
locale/en-US/editor/EditConflict.dtd (ui/dialogs/locale/en-US/EditConflict.dtd)
locale/en-US/editor/EditorSaveAsCharset.dtd (ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd)
US.jar:
locale/US/editor-region/contents.rdf (ui/composer/locale/en-US/contents-region.rdf)
locale/US/editor-region/region.properties (ui/composer/locale/en-US/region.properties)

2
editor/makefile.win
Просмотреть файл

@ -32,4 +32,6 @@ include <$(DEPTH)\config\rules.mak>
chrome::
$(REGCHROME) content editor comm.jar
$(REGCHROME) content editor-region comm.jar
$(REGCHROME) locale en-US/editor en-US.jar
$(REGCHROME) locale US/editor-region US.jar

2
editor/ui/composer.js
Просмотреть файл

@ -45,7 +45,7 @@ pref("editor.prettyprint", true);
pref("editor.htmlWrapColumn", 72);
pref("editor.throbber.url","chrome://editor/locale/editor.properties");
pref("editor.throbber.url","chrome://editor-region/locale/region.properties");
pref("editor.auto_save", false);
pref("editor.auto_save_delay", 10); // minutes

16
editor/ui/composer/content/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:editor-region"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:editor-region"
chrome:author="mozilla.org"
chrome:name="editor-region">
</RDF:Description>
</RDF:RDF>

21
editor/ui/composer/locale/en-US/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:US"
chrome:author="mozilla.org"
chrome:name="US"
chrome:previewURL="http://www.mozilla.org/locales/US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:US:packages">
<RDF:li resource="urn:mozilla:locale:US:editor-region"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
</RDF:RDF>

4
editor/ui/composer/locale/en-US/editor.properties
Просмотреть файл

@ -143,10 +143,6 @@ Drag=Drag
Unknown=Unknown
Close=Close
#
# editor.js
#
editor.throbber.url=http://www.mozilla.org/
#
# LOCALIZATION NOTE "RemoveTextStylesAccesskey" is used for both
# menu items: "RemoveTextStyles" and "StopTextStyles"
RemoveTextStylesAccesskey=x

4
editor/ui/composer/locale/en-US/region.properties Normal file
Просмотреть файл

@ -0,0 +1,4 @@
#
# editor.js
# editor.properties
editor.throbber.url=http://www.mozilla.org/

2
mailnews/Makefile.in
Просмотреть файл

@ -32,4 +32,6 @@ include $(topsrcdir)/config/rules.mk
chrome::
@$(REGCHROME) content messenger messenger.jar
@$(REGCHROME) content messenger-region messenger.jar
@$(REGCHROME) locale en-US/messenger en-US.jar
@$(REGCHROME) locale US/messenger-region US.jar

16
mailnews/base/resources/content/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:messenger-region"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:messenger-region"
chrome:author="mozilla.org"
chrome:name="messenger-region">
</RDF:Description>
</RDF:RDF>

21
mailnews/base/resources/locale/en-US/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:US"
chrome:author="mozilla.org"
chrome:name="US"
chrome:previewURL="http://www.mozilla.org/locales/US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:US:packages">
<RDF:li resource="urn:mozilla:locale:US:messenger-region"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
</RDF:RDF>

8
mailnews/base/resources/locale/en-US/messenger.properties
Просмотреть файл

@ -119,14 +119,7 @@ new=New
read=Read
# mailnews.js
mailnews.start_page.url=http://www.mozilla.org/mailnews/start.html
messenger.throbber.url=http://www.mozilla.org/
compose.throbber.url=http://www.mozilla.org/
addressbook.throbber.url=http://www.mozilla.org/
mailnews.send_default_charset=ISO-8859-1
mailnews.view_default_charset=ISO-8859-1
# offline msg
nocachedbodybody =The body of this message has not been downloaded from \n\
@ -150,4 +143,3 @@ nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n\
confirmUnsubscribeTitle=Confirm Unsubscribe
confirmUnsubscribeText=Are you sure you want to unsubscribe from %S?

8
mailnews/base/resources/locale/en-US/region.properties Normal file
Просмотреть файл

@ -0,0 +1,8 @@
#
# messenger.properties
# mailnews.js
mailnews.start_page.url=http://www.mozilla.org/mailnews/start.html
messenger.throbber.url=http://www.mozilla.org/
compose.throbber.url=http://www.mozilla.org/
addressbook.throbber.url=http://www.mozilla.org/
mailnews.view_default_charset=ISO-8859-1

5
mailnews/jar.mn
Просмотреть файл

@ -1,5 +1,6 @@
messenger.jar:
content/messenger/contents.rdf (base/resources/content/contents.rdf)
content/messenger-region/contents.rdf (base/resources/content/contents-region.rdf)
content/messenger/addressbook/pref-addressing.xul (addrbook/prefs/resources/content/pref-addressing.xul)
content/messenger/addressbook/pref-addressbookOverlay.xul (addrbook/prefs/resources/content/pref-addressbookOverlay.xul)
content/messenger/addressbook/abAddressBookNameDialog.js (addrbook/resources/content/abAddressBookNameDialog.js)
@ -244,3 +245,7 @@ en-US.jar:
locale/en-US/messenger/mime.properties (mime/resources/mime.properties)
locale/en-US/messenger/mimeheader.properties (mime/resources/mimeheader.properties)
locale/en-US/messenger/vcard.properties (mime/cthandlers/resources/vcard.properties)
US.jar:
locale/US/messenger-region/contents.rdf (base/resources/locale/en-US/contents-region.rdf)
locale/US/messenger-region/region.properties (base/resources/locale/en-US/region.properties)

10
mailnews/mailnews.js
Просмотреть файл

@ -120,7 +120,7 @@ pref("mailnews.force_ascii_search", false);
pref("mailnews.autolookup_unknown_mime_types", true);
pref("mailnews.send_default_charset", "chrome://messenger/locale/messenger.properties");
pref("mailnews.view_default_charset", "chrome://messenger/locale/messenger.properties");
pref("mailnews.view_default_charset", "chrome://messenger-region/locale/region.properties");
pref("mailnews.force_charset_override", false);
pref("mailnews.language_sensitive_font", true);
@ -222,7 +222,7 @@ pref("ldap_2.version", 3); /* Update kCurrentListVersion in include/di
pref("mailnews.confirm.moveFoldersToTrash", true);
pref("mailnews.start_page.url", "chrome://messenger/locale/messenger.properties");
pref("mailnews.start_page.url", "chrome://messenger-region/locale/region.properties");
pref("mailnews.start_page.enabled", true);
pref("mailnews.account_central_page.url", "chrome://messenger/locale/messenger.properties");
@ -290,9 +290,9 @@ pref("mail.startup.enabledMailCheckOnce", false);
pref("mailnews.max_header_display_length",3); // number of addresses to show
pref("messenger.throbber.url","chrome://messenger/locale/messenger.properties");
pref("compose.throbber.url","chrome://messenger/locale/messenger.properties");
pref("addressbook.throbber.url","chrome://messenger/locale/messenger.properties");
pref("messenger.throbber.url","chrome://messenger-region/locale/region.properties");
pref("compose.throbber.url","chrome://messenger-region/locale/region.properties");
pref("addressbook.throbber.url","chrome://messenger-region/locale/region.properties");
pref("mailnews.send_plaintext_flowed", true); // RFC 2646=======
pref("mailnews.display.disable_format_flowed_support", false);

2
mailnews/makefile.win
Просмотреть файл

@ -27,4 +27,6 @@ include <$(DEPTH)\config\rules.mak>
chrome::
$(REGCHROME) content messenger messenger.jar
$(REGCHROME) content messenger-region messenger.jar
$(REGCHROME) locale en-US/messenger en-US.jar
$(REGCHROME) locale US/messenger-region US.jar

2
modules/libpref/src/init/all.js
Просмотреть файл

@ -447,4 +447,4 @@ pref("bidi.support", 1);
pref("bidi.characterset", 1);
pref("browser.throbber.url","chrome://navigator/locale/navigator.properties");
pref("browser.throbber.url","chrome://navigator-region/locale/region.properties");

2
modules/libpref/src/init/config.js
Просмотреть файл

@ -23,7 +23,7 @@
// Default configuration information for the client
//
config("startup.homepage_override_url","chrome://navigator/locale/navigator.properties");
config("startup.homepage_override_url","chrome://navigator-region/locale/region.properties");
config("autoadmin.append_emailaddr",false);
config("autoadmin.failover_to_cached",true);

2
modules/libpref/src/init/editor.js
Просмотреть файл

@ -45,7 +45,7 @@ pref("editor.prettyprint", true);
pref("editor.htmlWrapColumn", 72);
pref("editor.throbber.url","chrome://editor/locale/editor.properties");
pref("editor.throbber.url","chrome://editor-region/locale/region.properties");
pref("editor.auto_save", false);
pref("editor.auto_save_delay", 10); // minutes

10
modules/libpref/src/init/mailnews.js
Просмотреть файл

@ -120,7 +120,7 @@ pref("mailnews.force_ascii_search", false);
pref("mailnews.autolookup_unknown_mime_types", true);
pref("mailnews.send_default_charset", "chrome://messenger/locale/messenger.properties");
pref("mailnews.view_default_charset", "chrome://messenger/locale/messenger.properties");
pref("mailnews.view_default_charset", "chrome://messenger-region/locale/region.properties");
pref("mailnews.force_charset_override", false);
pref("mailnews.language_sensitive_font", true);
@ -222,7 +222,7 @@ pref("ldap_2.version", 3); /* Update kCurrentListVersion in include/di
pref("mailnews.confirm.moveFoldersToTrash", true);
pref("mailnews.start_page.url", "chrome://messenger/locale/messenger.properties");
pref("mailnews.start_page.url", "chrome://messenger-region/locale/region.properties");
pref("mailnews.start_page.enabled", true);
pref("mailnews.account_central_page.url", "chrome://messenger/locale/messenger.properties");
@ -290,9 +290,9 @@ pref("mail.startup.enabledMailCheckOnce", false);
pref("mailnews.max_header_display_length",3); // number of addresses to show
pref("messenger.throbber.url","chrome://messenger/locale/messenger.properties");
pref("compose.throbber.url","chrome://messenger/locale/messenger.properties");
pref("addressbook.throbber.url","chrome://messenger/locale/messenger.properties");
pref("messenger.throbber.url","chrome://messenger-region/locale/region.properties");
pref("compose.throbber.url","chrome://messenger-region/locale/region.properties");
pref("addressbook.throbber.url","chrome://messenger-region/locale/region.properties");
pref("mailnews.send_plaintext_flowed", true); // RFC 2646=======
pref("mailnews.display.disable_format_flowed_support", false);

20
modules/plugin/base/src/nsPluginHostImpl.cpp
Просмотреть файл

@ -145,6 +145,7 @@ static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
#define PLUGIN_PROPERTIES_URL "chrome://global/locale/downloadProgress.properties"
#define PLUGIN_REGIONAL_URL "chrome://global-region/locale/region.properties"
// #defines for reading prefs and extra search plugin paths from windows registry
#define _MAXKEYVALUE_ 8196
@ -207,6 +208,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
nsCOMPtr<nsIIOService> io(do_GetService(kIOServiceCID));
nsCOMPtr<nsIStringBundleService> strings(do_GetService(kStringBundleServiceCID));
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIStringBundle> regionalBundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
@ -228,20 +230,12 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = io->NewURI(PLUGIN_PROPERTIES_URL, nsnull, getter_AddRefs(uri));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = uri->GetSpec(&spec);
if (NS_FAILED(rv)) {
nsCRT::free(spec);
return;
}
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
nsCRT::free(spec);
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
}
@ -254,8 +248,8 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
if (NS_FAILED(rv)) {
goto EXIT_DNDPD;
}
rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage").get(),
&messageUni);
rv = regionalBundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage").get(),
&messageUni);
if (NS_FAILED(rv)) {
goto EXIT_DNDPD;
}

20
modules/plugin/nglsrc/nsPluginHostImpl.cpp
Просмотреть файл

@ -145,6 +145,7 @@ static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
#define PLUGIN_PROPERTIES_URL "chrome://global/locale/downloadProgress.properties"
#define PLUGIN_REGIONAL_URL "chrome://global-region/locale/region.properties"
// #defines for reading prefs and extra search plugin paths from windows registry
#define _MAXKEYVALUE_ 8196
@ -207,6 +208,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
nsCOMPtr<nsIIOService> io(do_GetService(kIOServiceCID));
nsCOMPtr<nsIStringBundleService> strings(do_GetService(kStringBundleServiceCID));
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIStringBundle> regionalBundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
@ -228,20 +230,12 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = io->NewURI(PLUGIN_PROPERTIES_URL, nsnull, getter_AddRefs(uri));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = uri->GetSpec(&spec);
if (NS_FAILED(rv)) {
nsCRT::free(spec);
return;
}
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
nsCRT::free(spec);
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
}
@ -254,8 +248,8 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
if (NS_FAILED(rv)) {
goto EXIT_DNDPD;
}
rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage").get(),
&messageUni);
rv = regionalBundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage").get(),
&messageUni);
if (NS_FAILED(rv)) {
goto EXIT_DNDPD;
}

6
netwerk/protocol/http/src/nsHTTPHandler.cpp
Просмотреть файл

@ -1451,7 +1451,7 @@ nsHTTPHandler::PrefsChanged(const char* pref)
mPrefs->GetIntPref("network.http.keep-alive.max-connections-per-server",
&mMaxAllowedKeepAlivesPerServer);
#if defined(DEBUG_tao)
#if defined(DEBUG_tao_)
printf("\n--> nsHTTPHandler::PrefsChanged:pref=%s\n", pref?pref:"null");
#endif
if ( (bChangedAll)|| !PL_strcmp(pref, INTL_ACCEPT_LANGUAGES) ) // intl.accept_languages
@ -1461,7 +1461,7 @@ nsHTTPHandler::PrefsChanged(const char* pref)
getter_Copies(acceptLanguages));
if (NS_SUCCEEDED(rv))
SetAcceptLanguages(NS_ConvertUCS2toUTF8(acceptLanguages));
#if defined(DEBUG_tao)
#if defined(DEBUG_tao_)
printf("\n--> nsHTTPHandler::PrefsChanged: intl.accept_languages=%s\n",
(const char *)NS_ConvertUCS2toUTF8(acceptLanguages));
#endif
@ -1488,7 +1488,7 @@ nsHTTPHandler::PrefsChanged(const char* pref)
if (NS_SUCCEEDED(rv)) {
mAppLanguage = (const char*) NS_ConvertUCS2toUTF8(uval);
//
#if defined(DEBUG_tao)
#if defined(DEBUG_tao_)
printf("\n--> nsHTTPHandler::PrefsChanged:general.useragent.locale=%s\n",
(const char*) NS_ConvertUCS2toUTF8(uval));
#endif

2
profile/defaults/Makefile.in
Просмотреть файл

@ -39,4 +39,4 @@ FILES := $(addprefix $(srcdir)/, $(FILES))
install::
$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile
$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/en-US
$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/US

2
profile/defaults/makefile.win
Просмотреть файл

@ -34,4 +34,4 @@ FILES=\
install::
-for %i in ($(FILES:/=\)) do $(MAKE_INSTALL) %i $(DIST)\bin\defaults\profile
-for %i in ($(FILES:/=\)) do $(MAKE_INSTALL) %i $(DIST)\bin\defaults\profile\en-US
-for %i in ($(FILES:/=\)) do $(MAKE_INSTALL) %i $(DIST)\bin\defaults\profile\US

2
xpfe/browser/Makefile.in
Просмотреть файл

@ -32,4 +32,6 @@ include $(topsrcdir)/config/rules.mk
chrome::
@$(REGCHROME) content navigator comm.jar
@$(REGCHROME) content navigator-region comm.jar
@$(REGCHROME) locale en-US/navigator en-US.jar
@$(REGCHROME) locale US/navigator-region US.jar

7
xpfe/browser/jar.mn
Просмотреть файл

@ -1,5 +1,8 @@
comm.jar:
content/navigator/contents.rdf (resources/content/contents.rdf)
content/navigator-region/contents.rdf (resources/content/contents-region.rdf)
content/navigator/openLocation.js (resources/content/openLocation.js)
content/navigator/openLocation.xul (resources/content/openLocation.xul)
content/navigator/viewsource.js (resources/content/viewsource.js)
content/navigator/viewSource.xul (resources/content/viewSource.xul)
content/navigator/pageInfo.js (resources/content/pageInfo.js)
@ -18,3 +21,7 @@ en-US.jar:
locale/en-US/navigator/pageInfo.dtd (resources/locale/en-US/pageInfo.dtd)
locale/en-US/navigator/navigator.dtd (resources/locale/en-US/navigator.dtd)
locale/en-US/navigator/navigator.properties (resources/locale/en-US/navigator.properties)
US.jar:
locale/US/navigator-region/contents.rdf (resources/locale/en-US/contents-region.rdf)
locale/US/navigator-region/region.properties (resources/locale/en-US/region.properties)

2
xpfe/browser/makefile.win
Просмотреть файл

@ -27,4 +27,6 @@ include <$(DEPTH)\config\rules.mak>
chrome::
$(REGCHROME) content navigator comm.jar
$(REGCHROME) content navigator-region comm.jar
$(REGCHROME) locale en-US/navigator en-US.jar
$(REGCHROME) locale US/navigator-region US.jar

16
xpfe/browser/resources/content/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:navigator-region"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:navigator-region"
chrome:author="mozilla.org"
chrome:name="navigator-region">
</RDF:Description>
</RDF:RDF>

12
xpfe/browser/resources/content/navigator.js
Просмотреть файл

@ -27,6 +27,8 @@ const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
var gURLBar = null;
var gNavigatorBundle;
var gBrandBundle;
var gNavigatorRegionBundle;
var gBrandRegionBundle;
var pref = Components.classes["@mozilla.org/preferences;1"]
.getService(Components.interfaces.nsIPref);
@ -366,7 +368,7 @@ function getHomePage()
// use this if we can't find the pref
if (!url)
url = gNavigatorBundle.getString("homePageDefault");
url = gNavigatorRegionBundle.getString("homePageDefault");
return url;
}
@ -417,6 +419,8 @@ function Startup()
{
gNavigatorBundle = document.getElementById("bundle_navigator");
gBrandBundle = document.getElementById("bundle_brand");
gNavigatorRegionBundle = document.getElementById("bundle_navigator_region");
gBrandRegionBundle = document.getElementById("bundle_brand_region");
window.XULBrowserWindow = new nsXULBrowserWindow();
window.buttonPrefListener = new nsButtonPrefListener();
@ -669,7 +673,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
{
var autoOpenSearchPanel = false;
var defaultSearchURL = null;
var fallbackDefaultSearchURL = gNavigatorBundle.getString("fallbackDefaultSearchURL");
var fallbackDefaultSearchURL = gNavigatorRegionBundle.getString("fallbackDefaultSearchURL");
// XXX This somehow causes a big leak, back to the old way
// till we figure out why. See bug 61886.
// var url = getWebNavigation().currentURI.spec;
@ -689,7 +693,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
if (defaultSearchURL != fallbackDefaultSearchURL)
loadURI(defaultSearchURL);
else
loadURI(gNavigatorBundle.getString("otherSearchURL"));
loadURI(gNavigatorRegionBundle.getString("otherSearchURL"));
} else {
var searchMode = 0;
@ -1275,7 +1279,7 @@ function applyTheme(themeName)
function getNewThemes()
{
loadURI(gBrandBundle.getString("getNewThemesURL"));
loadURI(gBrandRegionBundle.getString("getNewThemesURL"));
}
function URLBarLeftClickHandler(aEvent)

2
xpfe/browser/resources/content/navigator.xul
Просмотреть файл

@ -76,6 +76,8 @@ Contributor(s): ______________________________________. -->
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
<stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
<stringbundle id="bundle_brand_region" src="chrome://global-region/locale/region.properties"/>
</stringbundleset>
<commands id="commands">

92
xpfe/browser/resources/content/openLocation.xul Normal file
Просмотреть файл

@ -0,0 +1,92 @@
<?xml version="1.0"?>
<!--
The contents of this file are subject to the Netscape 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/NPL/
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 Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
Contributor(s):
Ben Goodger <ben@netscape.com>
Michael Lowe <michael.lowe@bigfoot.com>
-->
<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % mozRegionalDTD SYSTEM "chrome://global-region/locale/region.dtd" >
%mozRegionalDTD;
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % openDialogDTD SYSTEM "chrome://navigator/locale/openLocation.dtd" >
%openDialogDTD;
]>
<window id="openLocation"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&caption.label;"
onload="onLoad()"
style="width: 40em;"
class="dialog"
align="vertical"
persist="screenX screenY"
screenX="24" screenY="24">
<script language="javascript" src="chrome://global/content/strres.js"/>
<script language="javascript" src="chrome://global/content/globalOverlay.js"/>
<script language="javascript" src="chrome://navigator/content/openLocation.js"/>
<script language="javascript" src="chrome://communicator/content/utilityOverlay.js"/>
<keyset id="keyset"/>
<box>
<box orient="vertical">
<image class="question-icon"/>
<spring flex="1"/>
</box>
<separator orient="vertical" class="thin"/>
<box orient="vertical" flex="1">
<html>&enter.label;</html>
<separator class="thin"/>
<box autostretch="never">
<textfield id="dialog.input" flex="1" oninput="doEnabling();"/>
<button value="&chooseFile.label;" onclick="onChooseFile();"/>
</box>
<box autostretch="never" valign="center">
<text class="label" value="&openWhere.label;"/>
<menulist id="openAppList">
<menupopup>
<menuitem data="0" id="currentWindow" value="&topWindow.label;"/>
<menuitem data="1" value="&newWindow.label;"/>
<menuseparator/>
<menuitem data="2" id="editWindow" value="&editNewWindow.label;"/>
</menupopup>
</menulist>
<spring flex="1"/>
</box>
</box>
</box>
<separator/>
<box id="okCancelButtonsRight"/>
</window>

21
xpfe/browser/resources/locale/en-US/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:US"
chrome:author="mozilla.org"
chrome:name="US"
chrome:previewURL="http://www.mozilla.org/locales/US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:US:packages">
<RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
</RDF:RDF>

11
xpfe/browser/resources/locale/en-US/navigator.properties
Просмотреть файл

@ -1,15 +1,6 @@
nv_done=Document: Done (%elapsed% secs)
homePageDefault=http://www.mozilla.org/
openFile=Open File
defaultStatus=
shopKeyword=keyword:shop [Product]
quoteKeyword=keyword:quote [Enter symbol here]
localKeyword=keyword:zip [Your zip code]
keywordList=http://home.netscape.com/escapes/keywords
webmailKeyword=http://webmail.netscape.com
careerKeyword=keyword:[Your city] careers
fallbackDefaultSearchURL=http://search.netscape.com/cgi-bin/search?charset=UTF-8&search=
otherSearchURL=http://home.netscape.com/bookmark/6_0/tsearch.html
droponhomebutton=Drop a link or file to make it your home page
droponhometitle=Set Home Page
@ -24,8 +15,6 @@ jserror=An error has occurred on this page. Double click here for details.
# all.js
#
browser.startup.homepage=http://www.mozilla.org/
browser.throbber.url=http://www.mozilla.org/
general.useragent.locale=en-US
intl.accept_languages=en
intl.charsetmenu.browser.static=iso-8859-1

25
xpfe/browser/resources/locale/en-US/region.properties Normal file
Просмотреть файл

@ -0,0 +1,25 @@
# navigator.properties
homePageDefault=http://www.mozilla.org/
shopKeyword=keyword:shop [Product]
quoteKeyword=keyword:quote [Enter symbol here]
localKeyword=keyword:zip [Your zip code]
keywordList=http://home.netscape.com/escapes/keywords
webmailKeyword=http://webmail.netscape.com
careerKeyword=keyword:[Your city] careers
fallbackDefaultSearchURL=http://search.netscape.com/cgi-bin/search?charset=UTF-8&search=
otherSearchURL=http://home.netscape.com/bookmark/6_0/tsearch.html
#
# all.js
#
browser.startup.homepage=http://www.mozilla.org/
browser.throbber.url=http://www.mozilla.org/
wallet.Server=http://www.mozilla.org/wallet/tables/
wallet.Samples=http://www.mozilla.org/wallet/samples/
#config.js
#
startup.homepage_override_url=http://www.mozilla.org/mozorg.html
# search-panel.properties
# Localizable URLs
defaultSearchURL=http://search.netscape.com/cgi-bin/search?charset=UTF-8&search=

2
xpfe/communicator/Makefile.in
Просмотреть файл

@ -32,4 +32,6 @@ include $(topsrcdir)/config/rules.mk
chrome::
@$(REGCHROME) content communicator comm.jar
@$(REGCHROME) content communicator-region comm.jar
@$(REGCHROME) locale en-US/communicator en-US.jar
@$(REGCHROME) locale US/communicator-region US.jar

6
xpfe/communicator/jar.mn
Просмотреть файл

@ -1,4 +1,5 @@
comm.jar:
content/communicator-region/contents.rdf (resources/content/contents-region.rdf)
content/communicator/contents.rdf (resources/content/contents.rdf)
content/communicator/communicatorOverlay.xul (resources/content/communicatorOverlay.xul)
content/communicator/utilityOverlay.xul (resources/content/utilityOverlay.xul)
@ -40,3 +41,8 @@ en-US.jar:
locale/en-US/communicator/askViewZoom.dtd (resources/locale/en-US/askViewZoom.dtd)
locale/en-US/communicator/viewZoomOverlay.dtd (resources/locale/en-US/viewZoomOverlay.dtd)
locale/en-US/communicator/viewZoomOverlay.properties (resources/locale/en-US/viewZoomOverlay.properties)
US.jar:
locale/US/communicator-region/contents.rdf (resources/locale/en-US/contents-region.rdf)
locale/US/communicator-region/region.dtd (resources/locale/en-US/region.dtd)
locale/US/communicator-region/taskbar.rdf (resources/locale/en-US/taskbar.rdf)

2
xpfe/communicator/makefile.win
Просмотреть файл

@ -27,4 +27,6 @@ include <$(DEPTH)\config\rules.mak>
chrome::
$(REGCHROME) content communicator comm.jar
$(REGCHROME) content communicator-region comm.jar
$(REGCHROME) locale en-US/communicator en-US.jar
$(REGCHROME) locale US/communicator-region US.jar

4
xpfe/communicator/resources/content/builtinURLs.js
Просмотреть файл

@ -84,7 +84,7 @@ function loadDS()
gTitleArc = gRDFService.GetResource("http://home.netscape.com/NC-rdf#title");
gContentArc = gRDFService.GetResource("http://home.netscape.com/NC-rdf#content");
var ds_uri = "chrome://global/locale/builtinURLs.rdf";
var ds_uri = "chrome://global-region/locale/builtinURLs.rdf";
var url_ds = gRDFService.GetDataSource(ds_uri); // return nsIRDFDataSource
if (!url_ds) {
debug_dump("\n >>Can't get " + ds_uri + "<-\n");
@ -93,7 +93,7 @@ function loadDS()
if (url_ds.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource).loaded)
{
ds_uri = "chrome://global/locale/builtinURLs.rdf";
ds_uri = "chrome://global-region/locale/builtinURLs.rdf";
gBuiltinUrlsDataSource = gRDFService.GetDataSource(ds_uri); // return nsIRDFDataSource
gDataSourceLoaded = (gBuiltinUrlsDataSource != null);
}

16
xpfe/communicator/resources/content/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:communicator-region"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:communicator-region"
chrome:author="mozilla.org"
chrome:name="communicator-region">
</RDF:Description>
</RDF:RDF>

4
xpfe/communicator/resources/content/taskbarOverlay.xul
Просмотреть файл

@ -11,8 +11,8 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:nc="http://home.netscape.com/NC-rdf#">
<box id="taskbarMenuBox" datasources="chrome://communicator/locale/taskbar.rdf"
ref="chrome://communicator/locale/taskbar.rdf#root"
<box id="taskbarMenuBox" datasources="chrome://communicator-region/locale/taskbar.rdf"
ref="chrome://communicator-region/locale/taskbar.rdf#root"
containment="http://home.netscape.com/NC-rdf#entry http://home.netscape.com/NC-rdf#child">
<spring flex="1"/>

3
xpfe/communicator/resources/content/utilityOverlay.js
Просмотреть файл

@ -320,12 +320,13 @@ function helpMenuCreate()
{
//adding the brand string to the about
var BrandBundle = srGetStrBundle("chrome://global/locale/brand.properties");
var regionalBundle = srGetStrBundle("chrome://global-region/locale/region.properties");
var aboutStrName = BrandBundle.GetStringFromName("aboutStrName");
var aboutItem = document.getElementById( "releaseName" );
aboutItem.setAttribute("value", aboutStrName);
//Adding the release url since it will change based on brand
var BrandRelUrl = BrandBundle.GetStringFromName("releaseUrl");
var BrandRelUrl = regionalBundle.GetStringFromName("releaseUrl");
var relCommand = "openTopWin(\'" + BrandRelUrl + "\')";
var relItem = document.getElementById( "releaseUrl" );
relItem.setAttribute("oncommand", relCommand);

21
xpfe/communicator/resources/locale/en-US/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,21 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:US"
chrome:author="mozilla.org"
chrome:name="US"
chrome:previewURL="http://www.mozilla.org/locales/US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:US:packages">
<RDF:li resource="urn:mozilla:locale:US:communicator-region"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
</RDF:RDF>

3
xpfe/communicator/resources/locale/en-US/region.dtd Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!-- timebomb.dtd -->
<!ENTITY warnText.label "This is a warning that this product will expire. Please visit http://www.mozilla.org for newer versions.">
<!ENTITY expireText.label "This version has expired. You must download a newer version at http://www.mozilla.org.">

2
xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
Просмотреть файл

@ -150,7 +150,7 @@
function moreInfo()
{
var browserURL = null;
var bundle = srGetStrBundle("chrome://global/locale/brand.properties");
var bundle = srGetStrBundle("chrome://global-region/locale/region.properties");
if (bundle)
var smartBrowsingURL = bundle.GetStringFromName("smartBrowsingURL");
if (smartBrowsingURL) {

2
xpfe/components/search/resources/locale/en-US/search-panel.properties
Просмотреть файл

@ -2,5 +2,3 @@ enterstringandlocation=Enter some text to search for and select at least one loc
enableAdvanced=Enable advanced search options
disableAdvanced=Disable advanced search options
# Localizable URLs
defaultSearchURL=http://search.netscape.com/cgi-bin/search?charset=UTF-8&search=

10
xpfe/components/search/resources/search-panel.js
Просмотреть файл

@ -38,11 +38,13 @@ const nsIRDFLiteral = Components.interfaces.nsIRDFLiteral;
const nsIRDFDataSource = Components.interfaces.nsIRDFDataSource;
const nsIRDFRemoteDataSource = Components.interfaces.nsIRDFRemoteDataSource;
const nsIInternetSearchService = Components.interfaces.nsIInternetSearchService;
const STRINGBUNDLE_REGIONAL_URL = "chrome://navigator-region/locale/region.properties";
var rootNode;
var textArc;
var modeArc;
var searchBundle;
var regionalBundle;
var sidebarInitiatedSearch = false;
@ -580,8 +582,10 @@ function OpenSearch(aSearchStr, engineURIs)
var searchEngineURI = nsPreferences.copyUnicharPref("browser.search.defaultengine", null);
var defaultSearchURL = nsPreferences.getLocalizedUnicharPref("browser.search.defaulturl", null);
if (!defaultSearchURL)
defaultSearchURL = searchBundle.getString("defaultSearchURL");
if (!defaultSearchURL) {
regionalBundle = srGetStrBundle( STRINGBUNDLE_REGIONAL_URL );
defaultSearchURL = regionalBundle.GetStringFromName("defaultSearchURL");
}
var searchDS = Components.classes[ISEARCH_CONTRACTID].getService(nsIInternetSearchService);
@ -600,7 +604,7 @@ function OpenSearch(aSearchStr, engineURIs)
}
if (!searchEngineURI)
searchEngineURI = searchBundle.getString("defaultSearchURL");
searchEngineURI = regionalBundle.GetStringFromName("defaultSearchURL");
// look up the correct search URL format for the given engine
try {

1
xpfe/components/search/resources/search-panel.xul
Просмотреть файл

@ -35,6 +35,7 @@
<script type="text/javascript" src="chrome://global/content/nsUserSettings.js"/>
<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
<script type="text/javascript" src="chrome://global/content/strres.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/search-panel.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/shared.js"/>

7
xpfe/components/timebomb/resources/content/expireText.xul
Просмотреть файл

@ -23,7 +23,12 @@ Contributor(s):
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
<!DOCTYPE window [
<!ENTITY % commRegionDTD SYSTEM "chrome://communicator-region/locale/region.dtd" >
%commRegionDTD;
<!ENTITY % timebombDTD SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
%timebombDTD;
]>
<window title="&title.label;"
id="timebomb-window"

7
xpfe/components/timebomb/resources/content/warn.xul
Просмотреть файл

@ -23,7 +23,12 @@ Contributor(s):
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
<!DOCTYPE window [
<!ENTITY % commRegionDTD SYSTEM "chrome://communicator-region/locale/region.dtd" >
%commRegionDTD;
<!ENTITY % timebombDTD SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
%timebombDTD;
]>
<window title="&title.label;"
id="timebomb-window"

2
xpfe/components/timebomb/resources/locale/en-US/timebomb.dtd
Просмотреть файл

@ -1,4 +1,2 @@
<!ENTITY title.label "Time Bomb Version">
<!ENTITY okButton.label "OK">
<!ENTITY warnText.label "This is a warning that this product will expire. Please visit http://www.mozilla.org for newer versions.">
<!ENTITY expireText.label "This version has expired. You must download a newer version at http://www.mozilla.org.">

3
xpfe/components/xfer/resources/locale/en-US/downloadProgress.properties
Просмотреть файл

@ -22,9 +22,6 @@ noDefaultPluginTitle=No Plugin Downloader Plugin!
#
# This is the message for the noDefaultPlugin dialog. Please note
# that the URL must be tweaked.
#
# Localizable URLs
noDefaultPluginMessage=Mozilla cannot find the Plugin Downloader Plugin. Without the Plugin Downloader Plugin, you cannot automatically download and install plugins. Please visit http://www.netscape.com/ to install the Plugin Downloader Plugin.
# LOCALIZATION NOTE (noDefaultPluginCheckboxMessage):
#
# This message tells the user that if they check this checkbox, they

2
xpfe/global/Makefile.in
Просмотреть файл

@ -40,5 +40,7 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number
chrome::
@$(REGCHROME) content global toolkit.jar
@$(REGCHROME) content global-region toolkit.jar
@$(REGCHROME) locale en-US/global en-US.jar
@$(REGCHROME) locale US/global-region US.jar

8
xpfe/global/jar.mn
Просмотреть файл

@ -1,5 +1,6 @@
toolkit.jar:
content/global/contents.rdf (resources/content/contents.rdf)
content/global-region/contents.rdf (resources/content/contents-region.rdf)
content/global/hiddenWindow.xul (resources/content/hiddenWindow.xul)
content/global/globalOverlay.xul (resources/content/globalOverlay.xul)
content/global/globalOverlay.js (resources/content/globalOverlay.js)
@ -52,7 +53,6 @@ en-US.jar:
locale/en-US/global/intl.css (resources/locale/en-US/intl.css)
locale/en-US/global/globalOverlay.dtd (resources/locale/en-US/globalOverlay.dtd)
locale/en-US/global/dialogOverlay.dtd (resources/locale/en-US/dialogOverlay.dtd)
locale/en-US/global/builtinURLs.rdf (resources/locale/en-US/builtinURLs.rdf)
locale/en-US/global/commonDialog.dtd (resources/locale/en-US/commonDialog.dtd)
locale/en-US/global/charsetOverlay.dtd (resources/locale/en-US/charsetOverlay.dtd)
locale/en-US/global/charsetDetectorsOverlay.dtd (resources/locale/en-US/charsetDetectorsOverlay.dtd)
@ -68,3 +68,9 @@ en-US.jar:
locale/en-US/global/regionNames.properties (resources/locale/en-US/regionNames.properties)
locale/en-US/global/about.html (resources/locale/en-US/about.html)
locale/en-US/global/commonDialogs.properties (resources/locale/en-US/commonDialogs.properties)
US.jar:
locale/US/global-region/contents.rdf (resources/locale/en-US/contents-region.rdf)
locale/US/global-region/region.dtd (resources/locale/en-US/region.dtd)
locale/US/global-region/region.properties (resources/locale/en-US/region.properties)
locale/US/global-region/builtinURLs.rdf (resources/locale/en-US/builtinURLs.rdf)

2
xpfe/global/makefile.win
Просмотреть файл

@ -30,7 +30,9 @@ include <$(DEPTH)\config\rules.mak>
chrome::
$(REGCHROME) content global toolkit.jar
$(REGCHROME) content global-region toolkit.jar
$(REGCHROME) locale en-US/global en-US.jar
$(REGCHROME) locale US/global-region US.jar
build.dtd: build.dtd.in $(DEPTH)\config\build_number
@rm -f $@

17
xpfe/global/resources/content/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,17 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the packages being supplied by this jar -->
<RDF:Seq about="urn:mozilla:package:root">
<RDF:li resource="urn:mozilla:package:global-region"/>
</RDF:Seq>
<!-- package information -->
<RDF:Description about="urn:mozilla:package:global-region"
chrome:displayName="US Regional Contents"
chrome:author="mozilla.org"
chrome:name="global-region">
</RDF:Description>
</RDF:RDF>

1
xpfe/global/resources/locale/en-US/brand.dtd
Просмотреть файл

@ -1,5 +1,4 @@
<!ENTITY brandShortName "Mozilla">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY vendorURL "http://www.mozilla.org/">

3
xpfe/global/resources/locale/en-US/brand.properties
Просмотреть файл

@ -1,7 +1,4 @@
brandShortName=Mozilla
vendorShortName=Mozilla
aboutStrName=About Mozilla
releaseUrl=http://www.mozilla.org/releases/
langAlert=Please restart Mozilla to use the new Languages and Web Content setting.
getNewThemesURL=http://x.themes.org/viewresources.phtml?type=chrome
smartBrowsingURL=http://www.mozilla.org/

22
xpfe/global/resources/locale/en-US/contents-region.rdf Normal file
Просмотреть файл

@ -0,0 +1,22 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:US"
chrome:displayName="US Region"
chrome:author="mozilla.org"
chrome:name="US"
chrome:previewURL="http://www.mozilla.org/locales/US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:US:packages">
<RDF:li resource="urn:mozilla:locale:US:global-region"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
</RDF:RDF>

2
xpfe/global/resources/locale/en-US/region.dtd Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<!-- brand.dtd -->
<!ENTITY vendorURL "http://www.mozilla.org/">

10
xpfe/global/resources/locale/en-US/region.properties Normal file
Просмотреть файл

@ -0,0 +1,10 @@
#
# Localizable URLs
#
noDefaultPluginMessage=Netscape cannot find the Plugin Downloader Plugin. Without the Plugin Downloader Plugin, you cannot automatically download and install plugins. Please visit http://www.netscape.com/ to install the Plugin Downloader Plugin.
#
# brand.properties
#
releaseUrl=http://www.mozilla.org/projects/seamonkey/release-notes/
getNewThemesURL=http://x.themes.org/viewresources.phtml?type=chrome
smartBrowsingURL=http://www.mozilla.org/

5
xpinstall/packager/mac/browser.jst
Просмотреть файл

@ -18,6 +18,11 @@ if (verifyDiskSpace(fProgram, srDest))
logComment("addDirectory() returned: " + err);
var cf = getFolder("Chrome");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/cookie/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/wallet/");

39
xpinstall/packager/mac/deflenus.jst
Просмотреть файл

@ -1,39 +0,0 @@
var srDest = $SpaceRequired$;
var err;
var fProgram;
// ----LOCALIZATION NOTE: translate only these ------
var prettyName = "US English Language Pack";
var regName = "defaults/mozilla/en-US";
// --- END CHANGABLE STUFF ---
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
if (verifyDiskSpace(fProgram, srDest))
{
err = addDirectory("",
"$Version$",
"viewer",
fProgram,
"",
true);
logComment("addDirectory() returned: " + err);
if (err == SUCCESS)
{
err = performInstall();
logComment("performInstall() returned: " + err);
}
else
{
cancelInstall(err);
logComment("cancelInstall due to error: " + err);
}
}
else
cancelInstall(INSUFFICIENT_DISK_SPACE);

3
xpinstall/packager/mac/mail.jst
Просмотреть файл

@ -20,6 +20,9 @@ if (verifyDiskSpace(fProgram, srDest))
err = registerChrome(CONTENT | DELAYED_CHROME,
getFolder("Chrome","messenger.jar"),
"content/messenger/");
err = registerChrome(CONTENT | DELAYED_CHROME,
getFolder("Chrome","messenger.jar"),
"content/messenger-region/");
logComment("registerChrome() returned: " + err);
if (err==SUCCESS)

47
xpinstall/packager/mac/regus.jst Normal file
Просмотреть файл

@ -0,0 +1,47 @@
var srDest = $SpaceRequired$;
var err;
var fProgram;
// --- LOCALIZATION NOTE: translate only these ---
var prettyName = "US Region Pack";
var regName = "locales/mozilla/US";
var chromeName = "US.jar";
// --- END LOCALIZABLE RESOURCES ---
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
if (verifyDiskSpace(fProgram, srDest))
{
err = addDirectory("",
"$Version$",
"viewer",
fProgram,
"",
true);
logComment("addDirectory() returned: " + err);
var cf = getFolder("Chrome");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/");
if(err == SUCCESS)
{
err = performInstall();
logComment("performInstall() returned: " + err);
}
else
{
cancelInstall(err);
logComment("cancelInstall due to error: " + err);
}
}
else
cancelInstall(INSUFFICIENT_DISK_SPACE);

9
xpinstall/packager/packages-mac
Просмотреть файл

@ -11,13 +11,18 @@
[langenus]
;
; en-US
viewer:defaults:profile:en-US:*
viewer:chrome:en-US.jar
[regus]
;
; US
viewer:chrome:US.jar
viewer:defaults:profile:US:*
viewer:Search Plugins:*
[deflenus]
;
; default files for en-US
; default files for US
viewer:defaults:profile:bookmarks.html
viewer:defaults:profile:panels.rdf
viewer:defaults:profile:localstore.rdf

9
xpinstall/packager/packages-unix
Просмотреть файл

@ -11,13 +11,18 @@
[langenus]
;
; en-US
bin/defaults/profile/en-US/*
bin/chrome/en-US.jar
[regus]
;
; US
bin/chrome/US.jar
bin/defaults/profile/US/*
bin/searchplugins/*
[deflenus]
;
; default files for en-US
; default files for US
bin/defaults/profile/bookmarks.html
bin/defaults/profile/panels.rdf
bin/defaults/profile/localstore.rdf

9
xpinstall/packager/packages-win
Просмотреть файл

@ -11,13 +11,18 @@
[langenus]
;
; en-US
bin\defaults\profile\en-US\*
bin\chrome\en-US\*
[regus]
;
; US
bin\chrome\US\*
bin\defaults\profile\US\*
bin\searchplugins\*
[deflenus]
;
; default files for en-US
; default files for US
bin\defaults\profile\bookmarks.html
bin\defaults\profile\panels.rdf
bin\defaults\profile\localstore.rdf

5
xpinstall/packager/unix/browser.jst
Просмотреть файл

@ -23,6 +23,11 @@ if (verifyDiskSpace(communicatorFolder, srDest))
logComment("dirCreate() returned: " + ignoreErr);
var cf = getFolder("Chrome");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/communicator-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/editor-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/navigator-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"toolkit.jar"),"content/global/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/cookie/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/wallet/");

13
xpinstall/packager/unix/config.it
Просмотреть файл

@ -42,6 +42,7 @@ C3=Component3
C4=Component5
C5=Component6
C6=Component7
C7=Component8
[Setup Type1]
; *** LOCALIZE ME BABY ***
@ -56,6 +57,7 @@ C4=Component4
C5=Component5
C6=Component6
C7=Component7
C8=Component8
[Setup Type2]
; *** LOCALIZE ME BABY ***
@ -68,6 +70,7 @@ C2=Component3
C3=Component5
C4=COmponent6
C5=Component7
C6=Component8
[Setup Type3]
; *** LOCALIZE ME BABY ***
@ -82,6 +85,7 @@ C4=Component4
C5=Component5
C6=Component6
C7=Component7
C8=Component8
;-------------------------------------------------------------------------
@ -164,6 +168,15 @@ $InstallSize$:langenus
Attributes=SELECTED|INVISIBLE
URL0=$URLPath$
[Component8]
Description Short=US Regional Pack
; *** LOCALIZE ME BABY ***
Description Long=Regional contents for US users
Archive=regus.xpi
$InstallSize$:regus
Attributes=SELECTED|INVISIBLE
URL0=$URLPath$
;-------------------------------------------------------------------------
[Dialog Start Install]
;-------------------------------------------------------------------------

38
xpinstall/packager/unix/deflenus.jst
Просмотреть файл

@ -1,38 +0,0 @@
var srDest = $SpaceRequired$;
var err;
var fProgram;
// ----LOCALIZATION NOTE: translate only these ------
var prettyName = "US English Language Pack";
var regName = "defaults/mozilla/en-US";
// --- END CHANGABLE STUFF ---
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
if (verifyDiskSpace(fProgram, srDest))
{
err = addDirectory("",
"$Version$",
"bin",
fProgram,
"",
true);
logComment("addDirectory() returned: " + err);
if (err == SUCCESS)
{
err = performInstall();
logComment("performInstall() returned: " + err);
}
else
{
cancelInstall(err);
logComment("cancelInstall due to error: " + err);
}
}
else
cancelInstall(INSUFFICIENT_DISK_SPACE);

4
xpinstall/packager/unix/mail.jst
Просмотреть файл

@ -21,6 +21,10 @@ if (verifyDiskSpace(communicatorFolder, srDest))
getFolder("Chrome","messenger.jar"),
"content/messenger/");
registerChrome(CONTENT | DELAYED_CHROME,
getFolder("Chrome","messenger.jar"),
"content/messenger-region/");
if (err==SUCCESS)
{
err = performInstall();

1
xpinstall/packager/unix/makeall.pl
Просмотреть файл

@ -72,6 +72,7 @@ MakeXpiFile("chatzilla");
MakeXpiFile("talkback");
MakeXpiFile("deflenus");
MakeXpiFile("langenus");
MakeXpiFile("regus");
# Make the config.ini file
MakeConfigFile();

47
xpinstall/packager/unix/regus.jst Normal file
Просмотреть файл

@ -0,0 +1,47 @@
var srDest = $SpaceRequired$;
var err;
var fProgram;
// --- LOCALIZATION NOTE: translate only these ---
var prettyName = "US Regional Pack";
var regName = "locales/mozilla/US";
var chromeName = "US.jar";
// --- END LOCALIZABLE RESOURCES ---
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
if (verifyDiskSpace(fProgram, srDest))
{
err = addDirectory("",
"$Version$",
"bin",
fProgram,
"",
true);
logComment("addDirectory() returned: " + err);
// register chrome
var cf = getFolder("Chrome");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/");
if (err == SUCCESS)
{
err = performInstall();
logComment("performInstall() returned: " + err);
}
else
{
cancelInstall(err);
logComment("cancelInstall due to error: " + err);
}
}
else
cancelInstall(INSUFFICIENT_DISK_SPACE);

4
xpinstall/packager/windows/browser.jst
Просмотреть файл

@ -239,11 +239,15 @@ if(verifyDiskSpace(fProgram, srDest))
// register chrome
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","toolkit.jar"),"content/global-region/");
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","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/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/editor-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/navigator-region/");
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/necko/");
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/communicator/");
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"),"skin/classic/editor/");

15
xpinstall/packager/windows/config.it
Просмотреть файл

@ -165,6 +165,7 @@ C2=Component PSM
C3=Component Uninstaller
C4=Component US English Profile Defaults
C5=Component En US lang pack
C6=Component US region pack
[Setup Type1]
;*** LOCALIZE ME BABY ***
@ -183,6 +184,7 @@ C4=Component Uninstaller
C5=Component Chatzilla
C6=Component US English Profile Defaults
C7=Component En US lang pack
C8=Component US region pack
[Setup Type2]
;*** LOCALIZE ME BABY ***
@ -203,6 +205,7 @@ C4=Component Uninstaller
C5=Component Chatzilla
C6=Component US English Profile Defaults
C7=Component En US lang pack
C8=Component US region pack
@ -442,6 +445,18 @@ $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 contents 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 PSM]
Description Short=Personal Security Manager
;*** LOCALIZE ME BABY ***

3
xpinstall/packager/windows/mail.jst
Просмотреть файл

@ -30,6 +30,9 @@ if(verifyDiskSpace(fProgram, srDest))
err = registerChrome(CONTENT | DELAYED_CHROME,
getFolder("Chrome","messenger.jar"),
"content/messenger/");
err = registerChrome(CONTENT | DELAYED_CHROME,
getFolder("Chrome","messenger.jar"),
"content/messenger-region/");
logComment("registerChrome() returned: "+err);
// check return value

3
xpinstall/packager/windows/makeall.pl
Просмотреть файл

@ -90,7 +90,8 @@ if(!(-d "$inStagePath"))
"psm",
"chatzilla",
"deflenus",
"langenus");
"langenus",
"regus");
if(VerifyComponents()) # return value of 0 means no errors encountered
{

50
xpinstall/packager/windows/regus.jst Normal file
Просмотреть файл

@ -0,0 +1,50 @@
// main
var srDest;
var err;
var fProgram;
// ----LOCALIZATION NOTE: translate only these ------
var prettyName = "US Region Pack";
var regName = "locales/mozilla/US";
var chromeName = "US.jar";
// --- END CHANGABLE STUFF ---
srDest = $SpaceRequired$:bin;
err = initInstall(prettyName, regName, "$Version$");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
if(verifyDiskSpace(fProgram, srDest))
{
setPackageFolder(fProgram);
err = addDirectory("",
"$Version$",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
true); // Force Flag
logComment("addDirectory() returned: " + err);
// register chrome
var cf = getFolder("Chrome");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/global-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/communicator-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/editor-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/messenger-region/");
registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName), "locale/US/navigator-region/");
// check return value
if(err == SUCCESS)
{
err = performInstall();
logComment("performInstall() returned: " + err);
}
else
cancelInstall(err);
}
else
cancelInstall(INSUFFICIENT_DISK_SPACE);
// end main

10
xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl
Просмотреть файл

@ -28,6 +28,7 @@ C2=Component2
C3=Component3
C4=Component4
C5=Component5
C6=Component6
[Setup Type1]
; *** LOCALIZE ME BABY ***
@ -40,6 +41,7 @@ C2=Component2
C3=Component3
C4=Component4
C5=Component5
C6=Component6
[Dialog Select Components]
; *** LOCALIZE ME BABY ***
@ -93,6 +95,14 @@ Archive=langenus.xpi
Install Size=<#langenus_size>
Attributes=SELECTED|INVISIBLE
[Component6]
Description Short=US Region Pack
; *** LOCALIZE ME BABY ***
Description Long=Regional contents for US users
Archive=regus.xpi
Install Size=<#regus_size>
Attributes=SELECTED|INVISIBLE
[Dialog Start Install]
; *** LOCALIZE ME BABY ***
Message0=Click the Install button to download and install the selected components.

10
xpinstall/wizard/mac/macbuild/config.ini_tmpl
Просмотреть файл

@ -28,6 +28,7 @@ C2=Component2
C3=Component3
C4=Component4
C5=Component5
C6=Component6
[Setup Type1]
; *** LOCALIZE ME BABY ***
@ -40,6 +41,7 @@ C2=Component2
C3=Component3
C4=Component4
C5=Component5
C6=Component6
[Dialog Select Components]
; *** LOCALIZE ME BABY ***
@ -93,6 +95,14 @@ Archive=langenus.xpi
Install Size=<#langenus_size>
Attributes=SELECTED|INVISIBLE
[Component6]
Description Short=US Region Pack
; *** LOCALIZE ME BABY ***
Description Long=Regional contents for US users
Archive=regus.xpi
Install Size=<#regus_size>
Attributes=SELECTED|INVISIBLE
[Dialog Start Install]
; *** LOCALIZE ME BABY ***
Message0=Click the Install button to download and install the selected components.