diff --git a/mozilla/browser/extensions/package-fixup/jar.mn b/mozilla/browser/extensions/package-fixup/jar.mn index 532fe7fbde5..9528736e725 100644 --- a/mozilla/browser/extensions/package-fixup/jar.mn +++ b/mozilla/browser/extensions/package-fixup/jar.mn @@ -10,9 +10,5 @@ classic.jar: comm.jar: * content/communicator/contents.rdf (../../../xpfe/communicator/resources/content/contents.rdf) -en-US.jar: -* locale/en-US/communicator/contents.rdf (../../../xpfe/communicator/resources/locale/en-US/contents.rdf) - locale/en-US/global/plugins.properties (../../../xpfe/global/resources/locale/en-US/plugins.properties) - toolkit.jar: content/global/plugins.html (../../../xpfe/global/resources/content/plugins.html) diff --git a/mozilla/embedding/components/webbrowserpersist/locale/en-US/nsWebBrowserPersist.properties b/mozilla/dom/locales/en-US/chrome/nsWebBrowserPersist.properties similarity index 100% rename from mozilla/embedding/components/webbrowserpersist/locale/en-US/nsWebBrowserPersist.properties rename to mozilla/dom/locales/en-US/chrome/nsWebBrowserPersist.properties diff --git a/mozilla/toolkit/locales/en-US/chrome/global/plugins.properties b/mozilla/dom/locales/en-US/chrome/plugins.properties similarity index 100% rename from mozilla/toolkit/locales/en-US/chrome/global/plugins.properties rename to mozilla/dom/locales/en-US/chrome/plugins.properties diff --git a/mozilla/toolkit/locales/en-US/chrome/global/printdialog.properties b/mozilla/dom/locales/en-US/chrome/printdialog.properties similarity index 100% rename from mozilla/toolkit/locales/en-US/chrome/global/printdialog.properties rename to mozilla/dom/locales/en-US/chrome/printdialog.properties diff --git a/mozilla/dom/locales/jar.mn b/mozilla/dom/locales/jar.mn index 7f074e4af43..c81cd0b0fac 100644 --- a/mozilla/dom/locales/jar.mn +++ b/mozilla/dom/locales/jar.mn @@ -14,3 +14,6 @@ locale/@AB_CD@/global/appstrings.properties (%chrome/appstrings.properties) locale/@AB_CD@/global/charsetTitles.properties (%chrome/charsetTitles.properties) locale/@AB_CD@/global/global-strres.properties (%chrome/global-strres.properties) + locale/@AB_CD@/global/plugins.properties (%chrome/plugins.properties) + locale/@AB_CD@/global/nsWebBrowserPersist.properties (%chrome/nsWebBrowserPersist.properties) + locale/@AB_CD@/global/printdialog.properties (%chrome/printdialog.properties) diff --git a/mozilla/embedding/components/ui/jar.mn b/mozilla/embedding/components/ui/jar.mn index 390a277538b..881d8fc5990 100644 --- a/mozilla/embedding/components/ui/jar.mn +++ b/mozilla/embedding/components/ui/jar.mn @@ -1,8 +1,10 @@ +#ifndef MOZ_XUL_APP en-US.jar: - locale/en-US/global/nsHelperAppDlg.dtd (helperAppDlg/locale/en-US/nsHelperAppDlg.dtd) - locale/en-US/global/nsHelperAppDlg.properties (helperAppDlg/locale/en-US/nsHelperAppDlg.properties) - locale/en-US/global/nsProgressDialog.dtd (progressDlg/locale/en-US/nsProgressDialog.dtd) - locale/en-US/global/nsProgressDialog.properties (progressDlg/locale/en-US/nsProgressDialog.properties) + locale/en-US/global/nsHelperAppDlg.dtd (/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd) + locale/en-US/global/nsHelperAppDlg.properties (/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.properties) + locale/en-US/global/nsProgressDialog.dtd (/toolkit/locales/en-US/chrome/global/nsProgressDialog.dtd) + locale/en-US/global/nsProgressDialog.properties (/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties) +#endif toolkit.jar: content/global/nsHelperAppDlg.xul (helperAppDlg/nsHelperAppDlg.xul) diff --git a/mozilla/embedding/components/webbrowserpersist/jar.mn b/mozilla/embedding/components/webbrowserpersist/jar.mn deleted file mode 100644 index c16a058f63a..00000000000 --- a/mozilla/embedding/components/webbrowserpersist/jar.mn +++ /dev/null @@ -1,2 +0,0 @@ -en-US.jar: - locale/en-US/global/nsWebBrowserPersist.properties (locale/en-US/nsWebBrowserPersist.properties) diff --git a/mozilla/gfx/src/jar.mn b/mozilla/gfx/src/jar.mn deleted file mode 100644 index 6069355eb95..00000000000 --- a/mozilla/gfx/src/jar.mn +++ /dev/null @@ -1,7 +0,0 @@ -en-US.jar: - locale/en-US/global/printdialog.properties - - - - - diff --git a/mozilla/gfx/src/printdialog.properties b/mozilla/gfx/src/printdialog.properties deleted file mode 100644 index 12278b616df..00000000000 --- a/mozilla/gfx/src/printdialog.properties +++ /dev/null @@ -1,41 +0,0 @@ -# ***** 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 Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either of 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 ***** -extend=true -PrintFrames=Print Frames -Aslaid=As &laid out on the screen -selectedframe=The selected &frame -Eachframe=&Each frame separately -options=Options diff --git a/mozilla/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.dtd b/mozilla/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd similarity index 100% rename from mozilla/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.dtd rename to mozilla/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.dtd diff --git a/mozilla/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.properties b/mozilla/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.properties similarity index 100% rename from mozilla/embedding/components/ui/helperAppDlg/locale/en-US/nsHelperAppDlg.properties rename to mozilla/toolkit/locales/en-US/chrome/global/nsHelperAppDlg.properties diff --git a/mozilla/embedding/components/ui/progressDlg/locale/en-US/nsProgressDialog.dtd b/mozilla/toolkit/locales/en-US/chrome/global/nsProgressDialog.dtd similarity index 100% rename from mozilla/embedding/components/ui/progressDlg/locale/en-US/nsProgressDialog.dtd rename to mozilla/toolkit/locales/en-US/chrome/global/nsProgressDialog.dtd diff --git a/mozilla/embedding/components/ui/progressDlg/locale/en-US/nsProgressDialog.properties b/mozilla/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties similarity index 100% rename from mozilla/embedding/components/ui/progressDlg/locale/en-US/nsProgressDialog.properties rename to mozilla/toolkit/locales/en-US/chrome/global/nsProgressDialog.properties diff --git a/mozilla/toolkit/locales/jar.mn b/mozilla/toolkit/locales/jar.mn index 6e8bf5ae9f7..1c88a9938ce 100644 --- a/mozilla/toolkit/locales/jar.mn +++ b/mozilla/toolkit/locales/jar.mn @@ -27,8 +27,6 @@ locale/@AB_CD@/global/license.dtd (%chrome/global/license.dtd) locale/@AB_CD@/global/mozilla.dtd (%chrome/global/mozilla.dtd) + locale/@AB_CD@/global/nsTreeSorting.properties (%chrome/global/nsTreeSorting.properties) - locale/@AB_CD@/global/plugins.properties (%chrome/global/plugins.properties) - locale/@AB_CD@/global/printdialog.properties (%chrome/global/printdialog.properties) + locale/@AB_CD@/global/printdialog.dtd (%chrome/global/printdialog.dtd) + locale/@AB_CD@/global/printjoboptions.dtd (%chrome/global/printjoboptions.dtd) + locale/@AB_CD@/global/printjoboptions.properties (%chrome/global/printjoboptions.properties) @@ -45,6 +43,10 @@ + locale/@AB_CD@/global/viewSource.dtd (%chrome/global/viewSource.dtd) + locale/@AB_CD@/global/viewSource.properties (%chrome/global/viewSource.properties) + locale/@AB_CD@/global/wizard.properties (%chrome/global/wizard.properties) + locale/@AB_CD@/global/nsHelperAppDlg.dtd (%chrome/global/nsHelperAppDlg.dtd) + locale/@AB_CD@/global/nsHelperAppDlg.properties (%chrome/global/nsHelperAppDlg.properties) + locale/@AB_CD@/global/nsProgressDialog.dtd (%chrome/global/nsProgressDialog.dtd) + locale/@AB_CD@/global/nsProgressDialog.properties (%chrome/global/nsProgressDialog.properties) locale/@AB_CD@/global/history/history.properties (%chrome/global/history/history.properties) locale/@AB_CD@/global/xpinstall/xpinstall.properties (%chrome/global/xpinstall/xpinstall.properties) * locale/@AB_CD@/global-region/contents.rdf (generic/chrome/global-region/contents.rdf) diff --git a/mozilla/xpfe/global/jar.mn b/mozilla/xpfe/global/jar.mn index 00a7a25d145..a947f492a87 100644 --- a/mozilla/xpfe/global/jar.mn +++ b/mozilla/xpfe/global/jar.mn @@ -98,7 +98,6 @@ en-US.jar: locale/en-US/global/commonDialogs.properties (resources/locale/en-US/commonDialogs.properties) locale/en-US/global/nsTreeSorting.properties (resources/locale/en-US/nsTreeSorting.properties) locale/en-US/global/dialog.properties (resources/locale/en-US/dialog.properties) - locale/en-US/global/plugins.properties (resources/locale/en-US/plugins.properties) locale/en-US/global/printdialog.dtd (resources/locale/en-US/printdialog.dtd) locale/en-US/global/printPageSetup.dtd (resources/locale/en-US/printPageSetup.dtd) locale/en-US/global/printPageSetup.properties (resources/locale/en-US/printPageSetup.properties) diff --git a/mozilla/xpfe/global/resources/locale/en-US/plugins.properties b/mozilla/xpfe/global/resources/locale/en-US/plugins.properties deleted file mode 100644 index 1f6f007053f..00000000000 --- a/mozilla/xpfe/global/resources/locale/en-US/plugins.properties +++ /dev/null @@ -1,16 +0,0 @@ -# LOCALIZATION NOTE (plugins.properties): -# Those strings are inserted into an HTML page, so you all HTML characters -# have to be escaped in a way that they show up correctly in HTML! - -title_label=About Plug-ins -installedplugins_label=Installed plug-ins -nopluginsareinstalled_label=No plug-ins are installed -findmore_label=Find more information about browser plug-ins at -installhelp_label=Help for installing plug-ins is available from -filename_label=File name: -mimetype_label=MIME Type -description_label=Description -suffixes_label=Suffixes -enabled_label=Enabled -yes_label=Yes -no_label=No