Bug 562877: addons manager rewrite re-used entity names with different values. r=dtownsend
authorBlair McBride <bmcbride@mozilla.com>
Thu, 06 May 2010 11:20:44 -0700
changeset 42087 381653b6c2898d347652ff0599c430d87c5d0e3a
parent 42086 f0f2c257757e5e98c5c0cd7bcd8d150904f8e986
child 42088 42101b017a4b08d2725c6afa73910bc613fc2684
push idunknown
push userunknown
push dateunknown
reviewersdtownsend
bugs562877
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 562877: addons manager rewrite re-used entity names with different values. r=dtownsend
toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
toolkit/mozapps/extensions/amWebInstallListener.js
toolkit/mozapps/extensions/content/extensions.xml
toolkit/mozapps/extensions/content/extensions.xul
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -1,9 +1,9 @@
-<!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">
 <!ENTITY listEmpty.search.label               "Could not find any matching add-ons">
 <!ENTITY listEmpty.button.label               "Learn more about add-ons">
 
 
 <!-- categories / views -->
@@ -29,25 +29,25 @@
 <!ENTITY cmd.showDetails.accesskey            "S">
 <!ENTITY cmd.findUpdates.label                "Find updates">
 <!ENTITY cmd.findUpdates.accesskey            "F">
 <!ENTITY cmd.preferences.label                "Preferences">
 <!ENTITY cmd.preferences.accesskey            "P">
 <!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">
 
 
 <!-- detail view -->
 <!ENTITY detail.version.label                 "Version">
 <!ENTITY detail.updated.label                 "Updated">
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -26,18 +26,18 @@ numReviews=#1 review;#1 reviews
 
 #LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
 dateUpdated=Updated %S
 
 #LOCALIZATION NOTE (incompatibleWith) %1$S is brand name, %2$S is application version
 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
 installDownloadFailed=Error downloading
 installVerifying=Verifying
 installInstalling=Installing
 installInstallPending=Ready to install
 installUpdatePending=Ready to update
--- a/toolkit/mozapps/extensions/amWebInstallListener.js
+++ b/toolkit/mozapps/extensions/amWebInstallListener.js
@@ -154,17 +154,17 @@ Installer.prototype = {
         title = bundle.GetStringFromName("blocklistedInstallTitle2");
         text = this.bundle.formatStringFromName("blocklistedInstallMsg2",
                                                 [install.addon.name], 1);
       }
       problems = problems.substring(0, problems.length - 2);
       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,
                                                Services.appinfo.version], 4);
       Services.prompt.alert(this.window, title, text);
     }
     else {
       this.installs.push(aInstall);
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -721,29 +721,29 @@
                         showmoreaccesskey="&showMore.accesskey;"
                         showmoretooltip="&showMore.tooltip;"
                         oncommand="document.getBindingParent(this).toggleDetails();"/>
           </xul:hbox>
         </xul:vbox>
         <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">
           <xul:hbox anonid="checking-update" hidden="true">
             <xul:image class="spinner"/>
             <xul:label value="&addon.checkingForUpdates.label;"/>
           </xul:hbox>
           <xul:hbox anonid="install-status" class="install-status"
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -41,17 +41,17 @@
 <?xml-stylesheet href="chrome://mozapps/skin/extensions/extensions.css"?>
 
 <!DOCTYPE page [
 <!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"/>
 
   <popupset>
     <!-- menu for an addon item -->
     <menupopup id="addonitem-popup">
       <menuitem id="menuitem_showDetails" command="cmd_showItemDetails"
@@ -259,29 +259,29 @@
                 </hbox>
                 <hbox>
                   <button id="detail-contribute" class="contribute"
                           label="&cmd.contribute.label;"
                           accesskey="&cmd.contribute.accesskey;"
                           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>
             </hbox>
             <hbox class="detail-extra">
                <vbox class="detail-prefs" flex="1">
                   <checkbox id="detail-autoUpdate" checked="true"
                             label="&detail.updateAutomatically.label;"