зеркало из https://github.com/mozilla/gecko-dev.git
move wizard.properties out of global-platform into global, by #ifdef'ing the locales in wizard.xml
remove unused locales instruct-first and instruct-last in wizard.properties remove duplicate wizardOverlay.css
This commit is contained in:
chanial%noos.fr
Родитель
5b415d5da6
Коммит
be4a62da09
|
|
@ -153,7 +153,7 @@
|
|||
var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
|
||||
.getService(Components.interfaces.nsILocaleService);
|
||||
var stringBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
|
||||
var bundleURL = "chrome://global-platform/locale/wizard.properties";
|
||||
var bundleURL = "chrome://global/locale/widgets/wizard.properties";
|
||||
this._bundle = stringBundleService.createBundle(bundleURL, localeService.GetApplicationLocale());
|
||||
|
||||
// get anonymous content references
|
||||
|
|
@ -337,9 +337,17 @@
|
|||
<body><![CDATA[
|
||||
var label = this.currentPage.getAttribute("label");
|
||||
if (!label && this.onFirstPage)
|
||||
#ifdef XP_MACOSX
|
||||
label = this._bundle.GetStringFromName("default-first-title-mac");
|
||||
#else
|
||||
label = this._bundle.formatStringFromName("default-first-title", [this.title], 1);
|
||||
#endif
|
||||
else if (!label && this.onLastPage)
|
||||
label = this._bundle.formatStringFromName("default-last-title", [this.title], 1);
|
||||
#ifdef XP_MACOSX
|
||||
label = this._bundle.GetStringFromName("default-last-title-mac");
|
||||
#else
|
||||
label = this._bundle.formatStringFromName("default-last-title)", [this.title], 1);
|
||||
#endif
|
||||
this._wizardHeader.setAttribute("label", label);
|
||||
this._wizardHeader.setAttribute("description", this.currentPage.getAttribute("description"));
|
||||
]]></body>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,29 @@
|
|||
toolkit.jar:
|
||||
+ content/global/MPL-1.1.html (content/MPL-1.1.html)
|
||||
+ content/global/contents.rdf (content/contents.rdf)
|
||||
+ content/global-platform/contents.rdf (content/contents-platform.rdf)
|
||||
+ content/global-region/contents.rdf (content/contents-region.rdf)
|
||||
*+ content/global/xul.css (content/xul.css)
|
||||
+ content/global/globalOverlay.js (content/globalOverlay.js)
|
||||
*+ content/global/finddialog.xul (content/finddialog.xul)
|
||||
*+ content/global/finddialog.js (content/finddialog.js)
|
||||
*+ content/global/findUtils.js (content/findUtils.js)
|
||||
+ content/global/commonDialog.xul (content/commonDialog.xul)
|
||||
+ content/global/commonDialog.js (content/commonDialog.js)
|
||||
* content/global/customizeToolbar.xul (content/customizeToolbar.xul)
|
||||
* content/global/customizeToolbar.js (content/customizeToolbar.js)
|
||||
content/global/customizeToolbar.css (content/customizeToolbar.css)
|
||||
+ content/global/charsetOverlay.xul (content/charsetOverlay.xul)
|
||||
+ content/global/charsetOverlay.js (content/charsetOverlay.js)
|
||||
*+ content/global/finddialog.xul (content/finddialog.xul)
|
||||
*+ content/global/finddialog.js (content/finddialog.js)
|
||||
*+ content/global/findUtils.js (content/findUtils.js)
|
||||
+ content/global/fontpackage.xul (content/fontpackage.xul)
|
||||
+ content/global/fontpackage.js (content/fontpackage.js)
|
||||
+ content/global/fullScreen.js (content/fullScreen.js)
|
||||
+ content/global/globalOverlay.js (content/globalOverlay.js)
|
||||
+ content/global/mozilla.xhtml (content/mozilla.xhtml)
|
||||
*+ content/global/nsDragAndDrop.js (content/nsDragAndDrop.js)
|
||||
+ content/global/nsTransferable.js (content/nsTransferable.js)
|
||||
*+ content/global/nsWidgetStateManager.js (content/nsWidgetStateManager.js)
|
||||
+ content/global/selectDialog.js (content/selectDialog.js)
|
||||
+ content/global/selectDialog.xul (content/selectDialog.xul)
|
||||
*+ content/global/viewZoomOverlay.js (content/viewZoomOverlay.js)
|
||||
* content/global/widgets/autocomplete.xml (content/widgets/autocomplete.xml)
|
||||
* content/global/widgets/browser.xml (content/widgets/browser.xml)
|
||||
|
|
@ -57,19 +72,20 @@ toolkit.jar:
|
|||
+ content/global/nsUserSettings.js (obsolete/content/nsUserSettings.js)
|
||||
|
||||
en-US.jar:
|
||||
+ locale/en-US/global/charset.dtd (locale/charset.dtd)
|
||||
+ locale/en-US/global/finddialog.dtd (locale/finddialog.dtd)
|
||||
+ locale/en-US/global/finddialog.properties (locale/finddialog.properties)
|
||||
+ locale/en-US/global/about.xhtml (locale/about.xhtml)
|
||||
+ locale/en-US/global/brand.dtd (locale/brand.dtd)
|
||||
*+ locale/en-US/global/brand.properties (locale/brand.properties)
|
||||
+ locale/en-US/global/about.xhtml (locale/about.xhtml)
|
||||
+ locale/en-US/global/build.dtd (locale/build.dtd)
|
||||
+ locale/en-US/global/charset.dtd (locale/charset.dtd)
|
||||
+ locale/en-US/global/customizeToolbar.dtd (locale/customizeToolbar.dtd)
|
||||
+ locale/en-US/global/customizeToolbar.properties (locale/customizeToolbar.properties)
|
||||
+ locale/en-US/global/finddialog.dtd (locale/finddialog.dtd)
|
||||
+ locale/en-US/global/finddialog.properties (locale/finddialog.properties)
|
||||
+ locale/en-US/global/dialog.properties (locale/widgets/dialog.properties)
|
||||
+ locale/en-US/global/tabbrowser.properties (locale/widgets/tabbrowser.properties)
|
||||
+ locale/en-US/global/tabbrowser.dtd (locale/widgets/tabbrowser.dtd)
|
||||
+ locale/en-US/global/wizard.properties (locale/widgets/wizard.properties)
|
||||
+ locale/en-US/global/textcontext.dtd (locale/widgets/textcontext.dtd)
|
||||
+ locale/en-US/global/build.dtd (locale/build.dtd)
|
||||
+ locale/en-US/global/dialog.properties (locale/widgets/dialog.properties)
|
||||
*+ locale/en-US/global/dialogOverlay.dtd (obsolete/locale/dialogOverlay.dtd)
|
||||
+ locale/en-US/global/wizardManager.properties (obsolete/locale/wizardManager.properties)
|
||||
+ locale/en-US/global/wizardOverlay.dtd (obsolete/locale/wizardOverlay.dtd)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
button-back=< Back
|
||||
button-next=Next >
|
||||
button-finish=Finish
|
||||
button-cancel=Cancel
|
||||
default-first-title=Welcome to the %S
|
||||
default-last-title=Completing the %S
|
||||
default-first-title-mac=Introduction
|
||||
default-last-title-mac=Conclusion
|
||||
|
||||
|
|
@ -25,7 +25,6 @@ classic.jar:
|
|||
+ skin/classic/global/toolbarbutton.css
|
||||
+ skin/classic/global/tree.css
|
||||
+ skin/classic/global/wizard.css
|
||||
+ skin/classic/global/wizardOverlay.css
|
||||
+ skin/classic/global/button.css
|
||||
+ skin/classic/global/menu.css
|
||||
skin/classic/global/expander.css
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#wiz-back-button {
|
||||
list-style-image : url("chrome://global/skin/scroll-left.gif");
|
||||
}
|
||||
#wiz-back-button[disabled] {
|
||||
list-style-image : url("chrome://global/skin/scroll-left-disabled.gif");
|
||||
}
|
||||
#wiz-next-button {
|
||||
list-style-image : url("chrome://global/skin/scroll-right.gif");
|
||||
}
|
||||
#wiz-next-button[disabled] {
|
||||
list-style-image : url("chrome://global/skin/scroll-right-disabled.gif");
|
||||
}
|
||||
|
||||
#wizardButtons
|
||||
{
|
||||
margin-bottom : 0.4em;
|
||||
}
|
||||
|
||||
.box-wizardcontent
|
||||
{
|
||||
margin-left : 44px;
|
||||
margin-right : 44px;
|
||||
width : 30em;
|
||||
}
|
||||
|
||||
Загрузка…
Ссылка в новой задаче