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

Bug 562877 - addons manager rewrite re-used entity names with different values

This commit is contained in:
Blair McBride 2010-05-01 10:04:23 +12:00
Родитель 90b68a3dd1
Коммит fdfb338b27
5 изменённых файлов: 32 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
Просмотреть файл

@ -1,4 +1,4 @@
<!ENTITY addons.title "Add-ons Manager">
<!ENTITY addons.windowTitle "Add-ons Manager">
<!ENTITY search.placeholder "Search all add-ons">
<!ENTITY loading.label "Loading…">
<!ENTITY listEmpty.installed.label "You don't have any add-ons of this type installed">
@ -34,15 +34,15 @@
<!ENTITY cmd.about.label "About">
<!ENTITY cmd.about.accesskey "A">
<!ENTITY cmd.enable.label "Enable">
<!ENTITY cmd.enable.accesskey "E">
<!ENTITY cmd.enable.tooltip "Enable this add-on">
<!ENTITY cmd.disable.label "Disable">
<!ENTITY cmd.disable.accesskey "D">
<!ENTITY cmd.disable.tooltip "Disable this add-on">
<!ENTITY cmd.uninstall.label "Remove">
<!ENTITY cmd.uninstall.accesskey "R">
<!ENTITY cmd.uninstall.tooltip "Uninstall this add-on">
<!ENTITY cmd.enableAddon.label "Enable">
<!ENTITY cmd.enableAddon.accesskey "E">
<!ENTITY cmd.enableAddon.tooltip "Enable this add-on">
<!ENTITY cmd.disableAddon.label "Disable">
<!ENTITY cmd.disableAddon.accesskey "D">
<!ENTITY cmd.disableAddon.tooltip "Disable this add-on">
<!ENTITY cmd.uninstallAddon.label "Remove">
<!ENTITY cmd.uninstallAddon.accesskey "R">
<!ENTITY cmd.uninstallAddon.tooltip "Uninstall this add-on">
<!ENTITY cmd.contribute.label "Contribute">
<!ENTITY cmd.contribute.accesskey "C">
<!ENTITY cmd.contribute.tooltip "Contribute to the development of this add-on">

4
toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
Просмотреть файл

@ -31,8 +31,8 @@ dateUpdated=Updated %S
incompatibleWith=Incompatible with %1$S %2$S
incompatibleTitle2=Incompatible add-on
#LOCALIZATION NOTE (incompatibleMessage) %1$S is add-on name, %2$% is add-on version, %3$% is application name, %4$% is application version
incompatibleMessage=%1$S %2$S could not be installed because it is not compatible with %3$S %4$S.
#LOCALIZATION NOTE (incompatibleMessage2) %1$S is add-on name, %2$% is add-on version, %3$% is application name, %4$% is application version
incompatibleMessage2=%1$S %2$S could not be installed because it is not compatible with %3$S %4$S.
installDownloading=Downloading
installDownloaded=Downloaded

2
toolkit/mozapps/extensions/amWebInstallListener.js
Просмотреть файл

@ -159,7 +159,7 @@ Installer.prototype = {
WARN("Not installing " + aInstall.addon.id + " because of the following: " + problems);
title = this.bundle.GetStringFromName("incompatibleTitle2", 1);
text = this.bundle.formatStringFromName("incompatibleMessage",
text = this.bundle.formatStringFromName("incompatibleMessage2",
[aInstall.addon.name,
aInstall.addon.version,
Services.appinfo.name,

18
toolkit/mozapps/extensions/content/extensions.xml
Просмотреть файл

@ -726,19 +726,19 @@
<xul:spacer flex="1"/>
<xul:hbox anonid="control-container" class="control-container">
<xul:button anonid="remove-btn" class="addon-control remove"
label="&cmd.uninstall.label;"
accesskey="&cmd.uninstall.accesskey;"
tooltiptext="&cmd.uninstall.tooltip;"
label="&cmd.uninstallAddon.label;"
accesskey="&cmd.uninstallAddon.accesskey;"
tooltiptext="&cmd.uninstallAddon.tooltip;"
oncommand="document.getBindingParent(this).uninstall();"/>
<xul:button anonid="enable-btn" class="addon-control enable"
label="&cmd.enable.label;"
accesskey="&cmd.enable.accesskey;"
tooltiptext="&cmd.enable.tooltip;"
label="&cmd.enableAddon.label;"
accesskey="&cmd.enableAddon.accesskey;"
tooltiptext="&cmd.enableAddon.tooltip;"
oncommand="document.getBindingParent(this).userDisabled = false;"/>
<xul:button anonid="disable-btn" class="addon-control disable"
label="&cmd.disable.label;"
accesskey="&cmd.disable.accesskey;"
tooltiptext="&cmd.disable.tooltip;"
label="&cmd.disableAddon.label;"
accesskey="&cmd.disableAddon.accesskey;"
tooltiptext="&cmd.disableAddon.tooltip;"
oncommand="document.getBindingParent(this).userDisabled = true;"/>
</xul:hbox>
<xul:hbox class="status-container">

22
toolkit/mozapps/extensions/content/extensions.xul
Просмотреть файл

@ -41,14 +41,12 @@
<?xml-stylesheet href="chrome://mozapps/skin/extensions/extensions.css"?>
<!DOCTYPE page [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
<!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
%extensionsDTD;
]>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="addons-page" title="&addons.title;">
id="addons-page" title="&addons.windowTitle;">
<script type="application/javascript"
src="chrome://mozapps/content/extensions/extensions.js"/>
@ -266,19 +264,19 @@
tooltiptext="&cmd.contribute.tooltip;"/>
<spacer flex="1"/>
<button id="detail-uninstall" class="addon-control remove"
label="&cmd.uninstall.label;"
accesskey="&cmd.uninstall.accesskey;"
tooltiptext="&cmd.uninstall.tooltip;"
label="&cmd.uninstallAddon.label;"
accesskey="&cmd.uninstallAddon.accesskey;"
tooltiptext="&cmd.uninstallAddon.tooltip;"
command="cmd_uninstallItem"/>
<button id="detail-enable" class="addon-control enable"
label="&cmd.enable.label;"
accesskey="&cmd.enable.accesskey;"
tooltiptext="&cmd.enable.tooltip;"
label="&cmd.enableAddon.label;"
accesskey="&cmd.enableAddon.accesskey;"
tooltiptext="&cmd.enableAddon.tooltip;"
command="cmd_enableItem"/>
<button id="detail-disable" class="addon-control disable"
label="&cmd.disable.label;"
accesskey="&cmd.disable.accesskey;"
tooltiptext="&cmd.disable.tooltip;"
label="&cmd.disableAddon.label;"
accesskey="&cmd.disableAddon.accesskey;"
tooltiptext="&cmd.disableAddon.tooltip;"
command="cmd_disableItem"/>
</hbox>
</vbox>