Bug 382447 - "Show passwords" button in preferences should be renamed. r=gavin, a1.9=beltzner, ui-r=beltzner

browser/components/preferences/security.xul

@@ -134,7 +134,7 @@
       <hbox id="showPasswordsBox">
         <spacer flex="1"/>
         <button id="showPasswords"
-                label="&showPasswords.label;" accesskey="&showPasswords.accesskey;"
+                label="&savedPasswords.label;" accesskey="&savedPasswords.accesskey;"
                 oncommand="gSecurityPane.showPasswords();"
                 preference="pref.privacy.disable_button.view_passwords"/>
       </hbox>

browser/locales/en-US/chrome/browser/preferences/security.dtd

@@ -30,8 +30,8 @@
 <!ENTITY  changeMasterPassword.label     "Change Master Password…">
 <!ENTITY  changeMasterPassword.accesskey "M">
 
-<!ENTITY  showPasswords.label            "Show Passwords…">
-<!ENTITY  showPasswords.accesskey        "P">
+<!ENTITY  savedPasswords.label            "Saved Passwords…">
+<!ENTITY  savedPasswords.accesskey        "P">
 
 
 <!ENTITY  warnings.label                "Warning Messages">

browser/locales/en-US/chrome/help/prefs.xhtml

@@ -468,9 +468,9 @@ Contributors:
     <em>Change Master Password…</em> button.  If a master password is already
     set, you will need to enter it in order to change or remove the master password.</p>
 
-  <p><em>Show Passwords…</em><br/>
+  <p><em>Saved Passwords…</em><br/>
     You can manage saved passwords and delete individual passwords by clicking
-    the <em>View Saved Passwords</em> button.</p>
+    the <em>Saved Passwords</em> button.</p>
   
   <h3 id="warning_messages">Warning Messages</h3>
   <p>Click the <em>Settings…</em> button to configure the security warnings

toolkit/components/passwordmgr/content/passwordManager.js

@@ -49,7 +49,7 @@ function SignonsStartup() {
   kSignonBundle = document.getElementById("signonBundle");
   document.getElementById("togglePasswords").label = kSignonBundle.getString("showPasswords");
   document.getElementById("togglePasswords").accessKey = kSignonBundle.getString("showPasswordsAccessKey");
-  document.getElementById("signonsIntro").value = kSignonBundle.getString("passwordsAll");
+  document.getElementById("signonsIntro").value = kSignonBundle.getString("loginsSpielAll");
   LoadSignons();
 
   // filter the table if requested by caller
@@ -252,7 +252,7 @@ function SignonClearFilter() {
   }
   signonsTreeView._lastSelectedRanges = [];
 
-  document.getElementById("signonsIntro").value = kSignonBundle.getString("passwordsAll");
+  document.getElementById("signonsIntro").value = kSignonBundle.getString("loginsSpielAll");
   document.getElementById("clearFilter").disabled = true;
   FocusFilterBox();
 }
@@ -322,7 +322,7 @@ function _filterPasswords()
   if (signonsTreeView.rowCount > 0)
     signonsTreeView.selection.select(0);
 
-  document.getElementById("signonsIntro").value = kSignonBundle.getString("passwordsFiltered");
+  document.getElementById("signonsIntro").value = kSignonBundle.getString("loginsSpielFiltered");
   document.getElementById("clearFilter").disabled = false;
 }
 

toolkit/components/passwordmgr/content/passwordManager.xul

@@ -49,7 +49,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup(); SignonsStartup();"
         onunload="Shutdown();"
-        title="&rememberPasswords.title;"
+        title="&savedPasswords.title;"
         persist="width height screenX screenY">
 
   <script src="chrome://passwordmgr/content/passwordManagerCommon.js"/>

toolkit/components/passwordmgr/content/passwordManagerExceptions.xul

@@ -49,7 +49,7 @@
             buttonlabelaccept="&closebutton.label;"
             onload="Startup(); RejectsStartup();"
             onunload="Shutdown();"
-            title="&dontRememberPasswords.title;"
+            title="&savedPasswordsExceptions.title;"
             persist="width height screenX screenY">
 
   <prefpane id="SignonViewerDialogPane" flex="1">
@@ -57,7 +57,7 @@
     <script src="chrome://passwordmgr/content/passwordManagerExceptions.js"/>
 
     <vbox id="rejectedsites" flex="1">
-        <description control="rejectsTree">&spiel.signonsnotstored.label;</description>
+        <description control="rejectsTree">&loginsSpielExceptions.label;</description>
         <separator class="thin"/>
         <tree id="rejectsTree" flex="1" style="height: 10em;" hidecolumnpicker="true"
               onkeypress="HandleRejectKeyPress(event)"

toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd

@@ -38,13 +38,12 @@
 # ***** END LICENSE BLOCK *****
 -->
 
-<!ENTITY      rememberPasswords.title         "Remember Passwords">
-<!ENTITY      dontRememberPasswords.title     "Don't Remember Passwords">
+<!ENTITY      savedPasswords.title            "Saved Passwords">
+<!ENTITY      savedPasswordsExceptions.title  "Exceptions - Saved Passwords">
 <!ENTITY      closebutton.label               "Close">
 <!ENTITY      closebutton.accesskey           "C">
 
-<!ENTITY      spiel.signonsstored.label       "Password Manager has saved login information for the following sites:">
-<!ENTITY      spiel.signonsnotstored.label    "Password Manager will never save login information for the following sites:">
+<!ENTITY      loginsSpielExceptions.label     "Passwords for the following sites will not be saved:">
 
 <!ENTITY      treehead.site.label             "Site">
 <!ENTITY      treehead.username.label         "Username">

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

@@ -64,5 +64,5 @@ showPasswordsAccessKey=P
 noMasterPasswordPrompt=Are you sure you wish to show your passwords?
 removeAllPasswordsPrompt=Are you sure you wish to remove all passwords?
 removeAllPasswordsTitle=Remove all passwords
-passwordsAll=The following passwords have been saved by the Password Manager:
-passwordsFiltered=The following passwords match your search:
+loginsSpielAll=Passwords for the following sites are stored on your computer:
+loginsSpielFiltered=The following passwords match your search: