Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 308916 - Extension Manager ui string review / cleanup. r=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@200779 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rob_strong%exchangecode.com 2006-06-24 01:09:08 +00:00
parent 1c2931ec42
commit 5c2c3c4a8f
5 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
View File

@ -91,11 +91,11 @@
<!-- Status Messsages -->
<!ENTITY needsDependencies.label "Requires additional items.">
<!ENTITY blocklisted.label "Disabled for your protection.">
<!ENTITY needsDisable.label "Will be disabled when &brandShortName; is restarted.">
<!ENTITY needsEnable.label "Will be enabled when &brandShortName; is restarted.">
<!ENTITY needsInstall.label "Will be installed when &brandShortName; is restarted.">
<!ENTITY needsUninstall.label "Will be uninstalled when &brandShortName; is restarted.">
<!ENTITY needsUpgrade.label "Will be upgraded when &brandShortName; is restarted.">
<!ENTITY toBeDisabled.label "This add-on will be disabled when &brandShortName; is restarted.">
<!ENTITY toBeEnabled.label "This add-on will be enabled when &brandShortName; is restarted.">
<!ENTITY toBeInstalled.label "This add-on will be installed when &brandShortName; is restarted.">
<!ENTITY toBeUninstalled.label "This add-on will be uninstalled when &brandShortName; is restarted.">
<!ENTITY toBeUpgraded.label "This add-on will be upgraded when &brandShortName; is restarted.">
<!ENTITY getExtensions.label "Get Extensions">
<!ENTITY getExtensions.tooltip "Get Extensions from addons.mozilla.org">

4
mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
View File

@ -25,8 +25,7 @@ restartButton=Restart %S
laterButton=Later
moreInfoText=More information
uninstallTitle=Uninstall %S
uninstallWarningDependMsg=If you uninstall %S, the following items that require this add-on will be disabled:
uninstallWarningMessage=If you uninstall %S, the functionality it offers will no longer be available.
uninstallWarnDependMsg=%S is required by one or more add-ons. If you continue, the following items will be disabled:
uninstallQueryMessage=Do you want to uninstall %S?
disableTitle=Disable %S
disableWarningDependMessage=If you disable %S, the following items that require this extension will also be disabled:
@ -62,7 +61,6 @@ incompatibleOlder=versions 0.8 or older.
incompatibleThemeName=this Theme
incompatibleExtension=Disabled - not compatible with %S %S
incompatibleAddonMsg=Not compatible with %S %S
needsDependenciesDisabled=Disabled - requires additional items to operate.
blocklistedDisabled=Disabled for your protection
invalidGUIDMessage="%S" could not be installed because of an error in its Install Manifest ("%S" is not a valid GUID). Please contact the author of this item about the problem.

9
mozilla/toolkit/mozapps/extensions/content/extensions.js
View File

@ -1638,14 +1638,7 @@ var gExtensionsViewController = {
var name = aSelectedItem.getAttribute("name");
var id = getIDFromResourceURI(aSelectedItem.id);
var dependentItems = gExtensionManager.getDependentItemListForID(id, true, { });
if (dependentItems.length > 0)
var message = getExtensionString("uninstallWarningDependMsg", [name]);
else
message = getExtensionString("uninstallWarningMessage", [name]);
var params = {
message1: message,
message2: getExtensionString("uninstallQueryMessage", [name]),
title: getExtensionString("uninstallTitle", [name]),
buttons: {
@ -1654,6 +1647,8 @@ var gExtensionsViewController = {
cancel: { label: getExtensionString("cancelButton") }
}
}
if (dependentItems.length > 0)
params.message1 = getExtensionString("uninstallWarnDependMsg", [name]);
var names = [];
for (var i = 0; i < dependentItems.length; ++i)
names.push(dependentItems[i].name + " " + dependentItems[i].version);

10
mozilla/toolkit/mozapps/extensions/content/extensions.xml
View File

@ -313,31 +313,31 @@
<binding id="addon-needs-install">
<content>
<xul:label value="&needsInstall.label;" crop="end"/>
<xul:label value="&toBeInstalled.label;" crop="end"/>
</content>
</binding>
<binding id="addon-needs-upgrade">
<content>
<xul:label value="&needsUpgrade.label;" crop="end"/>
<xul:label value="&toBeUpgraded.label;" crop="end"/>
</content>
</binding>
<binding id="addon-needs-uninstall">
<content>
<xul:label value="&needsUninstall.label;" crop="end"/>
<xul:label value="&toBeUninstalled.label;" crop="end"/>
</content>
</binding>
<binding id="addon-needs-enable">
<content>
<xul:label value="&needsEnable.label;" crop="end"/>
<xul:label value="&toBeEnabled.label;" crop="end"/>
</content>
</binding>
<binding id="addon-needs-disable">
<content>
<xul:label value="&needsDisable.label;" crop="end"/>
<xul:label value="&toBeDisabled.label;" crop="end"/>
</content>
</binding>

6
mozilla/toolkit/mozapps/extensions/content/list.xul
View File

@ -58,11 +58,11 @@
<vbox>
<image id="infoIcon"/>
</vbox>
<vbox class="spaced" style="width: 30em;">
<vbox class="spaced" style="min-width: 20em;">
<label id="message1" class="spaced" hidden="true"/>
<separator class="thin"/>
<tree id="addonsTree" rows="8" hidecolumnpicker="true" hidden="true" class="spaced">
<treecols>
<tree id="addonsTree" rows="6" hidecolumnpicker="true" hidden="true" class="spaced">
<treecols style="max-width: 25em;">
<treecol flex="1" id="nameColumn" hideheader="true"/>
</treecols>
<treechildren id="addonsChildren"/>