Bug 757439 - Use the updateButton string for the Update & Restart button in the About dialog; r=rstrong

browser/base/content/aboutDialog.js

@@ -116,18 +116,12 @@ function appUpdater()
     return;
   }
 
-  if (this.isPending) {
+  if (this.isPending || this.isApplied) {
     this.setupUpdateButton("update.restart." +
                            (this.isMajor ? "upgradeButton" : "updateButton"));
     return;
   }
 
-  if (this.isApplied) {
-    this.setupUpdateButton("update.restart." +
-                           (this.isMajor ? "upgradeButton" : "restartButton"));
-    return;
-  }
-
   if (this.isDownloading) {
     this.startDownload();
     return;
@@ -539,7 +533,7 @@ appUpdater.prototype =
           if (status == "applied" || status == "applied-service") {
             self.selectPanel("updateButtonBox");
             self.setupUpdateButton("update.restart." +
-                                   (self.isMajor ? "upgradeButton" : "restartButton"));
+                                   (self.isMajor ? "upgradeButton" : "updateButton"));
             timer.cancel();
             timer = null;
           } else if (status == "failed") {

browser/locales/en-US/chrome/browser/browser.properties

@@ -156,8 +156,6 @@ update.openUpdateUI.applyButton.label=Apply Update…
 update.openUpdateUI.applyButton.accesskey=A
 update.restart.updateButton.label=Restart to Update
 update.restart.updateButton.accesskey=R
-update.restart.restartButton.label=Update & Restart
-update.restart.restartButton.accesskey=R
 update.openUpdateUI.upgradeButton.label=Upgrade Now…
 update.openUpdateUI.upgradeButton.accesskey=U
 update.restart.upgradeButton.label=Upgrade Now