diff options
4 files changed, 17 insertions, 3 deletions
diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js index 333dc1d24..fcf6a0cb9 100644 --- a/toolkit/components/passwordmgr/content/passwordManager.js +++ b/toolkit/components/passwordmgr/content/passwordManager.js @@ -80,6 +80,8 @@ function Startup() { togglePasswordsButton.label = kSignonBundle.getString("showPasswords"); togglePasswordsButton.accessKey = kSignonBundle.getString("showPasswordsAccessKey"); signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionAll"); + removeAllButton.setAttribute("label", kSignonBundle.getString("removeAll.label")); + removeAllButton.setAttribute("accesskey", kSignonBundle.getString("removeAll.accesskey")); document.getElementsByTagName("treecols")[0].addEventListener("click", (event) => { let { target, button } = event; let sortField = target.getAttribute("data-field-name"); @@ -555,6 +557,8 @@ function SignonClearFilter() { signonsTreeView._lastSelectedRanges = []; signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionAll"); + removeAllButton.setAttribute("label", kSignonBundle.getString("removeAll.label")); + removeAllButton.setAttribute("accesskey", kSignonBundle.getString("removeAll.accesskey")); } function FocusFilterBox() { @@ -623,6 +627,8 @@ function FilterPasswords() { signonsTreeView.selection.select(0); signonsIntro.textContent = kSignonBundle.getString("loginsDescriptionFiltered"); + removeAllButton.setAttribute("label", kSignonBundle.getString("removeAllShown.label")); + removeAllButton.setAttribute("accesskey", kSignonBundle.getString("removeAllShown.accesskey")); } function CopyPassword() { diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul index d248283b6..364ad6e18 100644 --- a/toolkit/components/passwordmgr/content/passwordManager.xul +++ b/toolkit/components/passwordmgr/content/passwordManager.xul @@ -110,7 +110,6 @@ label="&remove.label;" accesskey="&remove.accesskey;" oncommand="DeleteSignon();"/> <button id="removeAllSignons" icon="clear" - label="&removeall.label;" accesskey="&removeall.accesskey;" oncommand="DeleteAllSignons();"/> <spacer flex="1"/> #if defined(MOZ_BUILD_APP_IS_BROWSER) && defined(XP_WIN) diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd b/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd index 36a61cfd9..84e4ff69c 100644 --- a/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd +++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd @@ -17,8 +17,6 @@ <!ENTITY remove.label "Remove"> <!ENTITY remove.accesskey "R"> -<!ENTITY removeall.label "Remove All"> -<!ENTITY removeall.accesskey "A"> <!ENTITY addLogin.label "Add Login"> <!ENTITY addLogin.accesskey "L"> diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties index 96190a2d7..6a399bbfc 100644 --- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties +++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties @@ -68,3 +68,14 @@ duplicateLogin=A duplicate login already exists. insecureFieldWarningDescription = This connection is not secure. Logins entered here could be compromised. insecureFieldWarningLearnMore = Learn More + +# LOCALIZATION NOTE (removeAll, removeAllShown): +# removeAll and removeAllShown are both used on the same one button, +# never displayed together and can share the same accesskey. +# When only partial sites are shown as a result of keyword search, +# removeAllShown is displayed as button label. +# removeAll is displayed when no keyword search and all sites are shown. +removeAll.label=Remove All +removeAll.accesskey=A +removeAllShown.label=Remove All Shown +removeAllShown.accesskey=A |