Fix the access key conflict in the password manager prompt (bug 1279586). r=johannh

MozReview-Commit-ID: 3XquO7Evzgb

--HG--
extra : rebase_source : ace9ed3077559915e7779d3647ded9503e8046cf

toolkit/components/passwordmgr/nsLoginManagerPrompter.js

@@ -962,7 +962,7 @@ LoginManagerPrompter.prototype = {
 
     let usernamePlaceholder = this._getLocalizedString("noUsernamePlaceholder");
     let togglePasswordLabel = this._getLocalizedString("togglePasswordLabel");
-    let togglePasswordAccessKey = this._getLocalizedString("togglePasswordAccessKey");
+    let togglePasswordAccessKey = this._getLocalizedString("togglePasswordAccessKey2");
 
     this._getPopupNote().show(
       browser,

toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties

@@ -30,7 +30,7 @@ rememberPasswordMsgNoUsername = Would you like to remember the password on %S?
 # This is displayed in place of the username when it is missing.
 noUsernamePlaceholder=No username
 togglePasswordLabel=Show password
-togglePasswordAccessKey=S
+togglePasswordAccessKey2=h
 notNowButtonText = &Not Now
 notifyBarNotNowButtonText = Not Now
 notifyBarNotNowButtonAccessKey = N