Bug 838211 - String changes for Metro login manager notifications [r=fryn]

browser/metro/components/LoginManagerPrompter.js

@@ -179,23 +179,18 @@ LoginManagerPrompter.prototype = {
      *
      */
     _showSaveLoginNotification : function (aNotifyBox, aLogin) {
-
         // Ugh. We can't use the strings from the popup window, because they
         // have the access key marked in the string (eg "Mo&zilla"), along
         // with some weird rules for handling access keys that do not occur
         // in the string, for L10N. See commonDialog.js's setLabelForNode().
         var neverButtonText =
-              this._getLocalizedString("notifyBarNeverForSiteButtonText");
+              this._getLocalizedString("notifyBarNotForThisSiteButtonText");
         var neverButtonAccessKey =
-              this._getLocalizedString("notifyBarNeverForSiteButtonAccessKey");
+              this._getLocalizedString("notifyBarNotForThisSiteButtonAccessKey");
         var rememberButtonText =
-              this._getLocalizedString("notifyBarRememberButtonText");
+              this._getLocalizedString("notifyBarRememberPasswordButtonText");
         var rememberButtonAccessKey =
-              this._getLocalizedString("notifyBarRememberButtonAccessKey");
-        var notNowButtonText =
-              this._getLocalizedString("notifyBarNotNowButtonText");
-        var notNowButtonAccessKey =
-              this._getLocalizedString("notifyBarNotNowButtonAccessKey");
+              this._getLocalizedString("notifyBarRememberPasswordButtonAccessKey");
 
         var brandShortName =
               this._brandBundle.GetStringFromName("brandShortName");
@@ -237,14 +232,6 @@ LoginManagerPrompter.prototype = {
                 callback: function(aNotificationBar, aButton) {
                     pwmgr.setLoginSavingEnabled(aLogin.hostname, false);
                 }
-            },
-
-            // "Not now" button
-            {
-                label:     notNowButtonText,
-                accessKey: notNowButtonAccessKey,
-                popup:     null,
-                callback:  function() { /* NOP */ } 
             }
         ];
 

browser/metro/locales/en-US/overrides/passwordmgr.properties

@@ -11,14 +11,12 @@ saveLoginText = Do you want %1$S to remember the password for "%2$S" on %3$S?
 # 1st string is product name, 2nd is the login's hostname
 saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S?
 promptNotNowButtonText = Not Now
-notifyBarNotNowButtonText = Not Now
-notifyBarNotNowButtonAccessKey =
 promptNeverForSiteButtonText = Never
-notifyBarNeverForSiteButtonText = Never
-notifyBarNeverForSiteButtonAccessKey =
+notifyBarNotForThisSiteButtonText = Not for this Site
+notifyBarNotForThisSiteButtonAccessKey =
 promptRememberButtonText = Remember
-notifyBarRememberButtonText = Remember
-notifyBarRememberButtonAccessKey =
+notifyBarRememberPasswordButtonText = Remember Password
+notifyBarRememberPasswordButtonAccessKey =
 passwordChangeTitle = Confirm Password Change
 passwordChangeText = Would you like to change the stored password for %S?
 passwordChangeTextNoUser = Would you like to change the stored password for this login?