Bug 1867011 - Update Strings for about:logins - Remove passwords - r=jneuberger,fluent-reviewers,kpatenio

Differential Revision: https://phabricator.services.mozilla.com/D194980

browser/components/aboutlogins/content/aboutLogins.html

@@ -366,7 +366,7 @@
         <button role="menuitem" class="menuitem-button menuitem-import-browser ghost-button" hidden data-supported-platforms="Win32,MacIntel" data-event-name="AboutLoginsImportFromBrowser" data-l10n-id="about-logins-menu-menuitem-import-from-another-browser"></button>
         <button role="menuitem" class="menuitem-button menuitem-import-file ghost-button" data-event-name="AboutLoginsImportFromFile" data-l10n-id="about-logins-menu-menuitem-import-from-a-file"></button>
         <button role="menuitem" class="menuitem-button menuitem-export ghost-button" data-event-name="AboutLoginsExportPasswordsDialog" data-l10n-id="about-logins-menu-menuitem-export-logins"></button>
-        <button role="menuitem" class="menuitem-button menuitem-remove-all-logins ghost-button" data-event-name="AboutLoginsRemoveAllLoginsDialog" data-l10n-id="about-logins-menu-menuitem-remove-all-logins"></button>
+        <button role="menuitem" class="menuitem-button menuitem-remove-all-logins ghost-button" data-event-name="AboutLoginsRemoveAllLoginsDialog" data-l10n-id="about-logins-menu-menuitem-remove-all-logins2"></button>
         <hr role="separator" class="menuitem-separator"></hr>
         <button role="menuitem" class="menuitem-button menuitem-preferences ghost-button" data-event-name="AboutLoginsOpenPreferences" data-l10n-id="menu-menuitem-preferences"></button>
         <button role="menuitem" class="menuitem-button menuitem-help ghost-button" data-event-name="AboutLoginsGetHelp" data-l10n-id="about-logins-menu-menuitem-help"></button>

browser/components/aboutlogins/content/aboutLogins.mjs

@@ -156,14 +156,14 @@ window.addEventListener("AboutLoginsRemoveAllLoginsDialog", () => {
   let loginItem = document.querySelector("login-item");
   let options = {};
   if (fxaLoggedIn && passwordSyncEnabled) {
-    options.title = "about-logins-confirm-remove-all-sync-dialog-title";
-    options.message = "about-logins-confirm-remove-all-sync-dialog-message2";
+    options.title = "about-logins-confirm-remove-all-sync-dialog-title2";
+    options.message = "about-logins-confirm-remove-all-sync-dialog-message3";
   } else {
-    options.title = "about-logins-confirm-remove-all-dialog-title";
-    options.message = "about-logins-confirm-remove-all-dialog-message";
+    options.title = "about-logins-confirm-remove-all-dialog-title2";
+    options.message = "about-logins-confirm-remove-all-dialog-message2";
   }
   options.confirmCheckboxLabel =
-    "about-logins-confirm-remove-all-dialog-checkbox-label";
+    "about-logins-confirm-remove-all-dialog-checkbox-label2";
   options.confirmButtonLabel =
     "about-logins-confirm-remove-all-dialog-confirm-button-label";
   options.count = numberOfLogins;

browser/components/aboutlogins/content/components/login-item.mjs

@@ -700,8 +700,8 @@ export default class LoginItem extends HTMLElement {
     switch (type) {
       case "delete": {
         options = {
-          title: "about-logins-confirm-remove-dialog-title",
-          message: "confirm-delete-dialog-message",
+          title: "about-logins-confirm-delete-dialog-title",
+          message: "about-logins-confirm-delete-dialog-message",
           confirmButtonLabel:
             "about-logins-confirm-remove-dialog-confirm-button",
         };

browser/components/aboutlogins/tests/browser/browser_confirmDeleteDialog.js

@@ -37,23 +37,23 @@ add_task(async function test() {
     ]);
 
     Assert.equal(
-      title.textContent,
-      "Remove this login?",
+      title.dataset.l10nId,
+      "about-logins-confirm-delete-dialog-title",
       "Title contents should match l10n attribute set on outer element"
     );
     Assert.equal(
-      message.textContent,
-      "This action cannot be undone.",
+      message.dataset.l10nId,
+      "about-logins-confirm-delete-dialog-message",
       "Message contents should match l10n attribute set on outer element"
     );
     Assert.equal(
-      cancelButton.textContent,
-      "Cancel",
+      cancelButton.dataset.l10nId,
+      "confirmation-dialog-cancel-button",
       "Cancel button contents should match l10n attribute set on outer element"
     );
     Assert.equal(
-      confirmDeleteButton.textContent,
-      "Remove",
+      confirmDeleteButton.dataset.l10nId,
+      "about-logins-confirm-remove-dialog-confirm-button",
       "Remove button contents should match l10n attribute set on outer element"
     );
 

browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js

@@ -119,17 +119,17 @@ add_task(async function test_remove_all_dialog_l10n() {
     ]);
     Assert.equal(
       title.dataset.l10nId,
-      "about-logins-confirm-remove-all-dialog-title",
+      "about-logins-confirm-remove-all-dialog-title2",
       "Title contents should match l10n-id attribute set on element"
     );
     Assert.equal(
       message.dataset.l10nId,
-      "about-logins-confirm-remove-all-dialog-message",
+      "about-logins-confirm-remove-all-dialog-message2",
       "Message contents should match l10n-id attribute set on element"
     );
     Assert.equal(
       label.dataset.l10nId,
-      "about-logins-confirm-remove-all-dialog-checkbox-label",
+      "about-logins-confirm-remove-all-dialog-checkbox-label2",
       "Label contents should match l10n-id attribute set on outer element"
     );
     Assert.equal(
@@ -272,7 +272,7 @@ add_task(async function test_remove_all_dialog_remove_logins() {
     );
     Assert.equal(
       title.dataset.l10nId,
-      "about-logins-confirm-remove-all-dialog-title",
+      "about-logins-confirm-remove-all-dialog-title2",
       "Title contents should match l10n-id attribute set on element"
     );
     Assert.equal(
@@ -282,7 +282,7 @@ add_task(async function test_remove_all_dialog_remove_logins() {
     );
     Assert.equal(
       message.dataset.l10nId,
-      "about-logins-confirm-remove-all-dialog-message",
+      "about-logins-confirm-remove-all-dialog-message2",
       "Message contents should match l10n-id attribute set on element"
     );
     Assert.equal(
@@ -292,7 +292,7 @@ add_task(async function test_remove_all_dialog_remove_logins() {
     );
     Assert.equal(
       label.dataset.l10nId,
-      "about-logins-confirm-remove-all-dialog-checkbox-label",
+      "about-logins-confirm-remove-all-dialog-checkbox-label2",
       "Label contents should match l10n-id attribute set on outer element"
     );
     Assert.equal(

browser/locales/en-US/browser/aboutLogins.ftl

@@ -25,7 +25,8 @@ menu =
 about-logins-menu-menuitem-import-from-another-browser = Import from Another Browser…
 about-logins-menu-menuitem-import-from-a-file = Import from a File…
 about-logins-menu-menuitem-export-logins = Export Logins…
-about-logins-menu-menuitem-remove-all-logins = Remove All Logins…
+# Item that appears when the user clicks the ⋯  menu
+about-logins-menu-menuitem-remove-all-logins2 = Remove All Passwords…
 menu-menuitem-preferences =
   { PLATFORM() ->
       [windows] Options
@@ -176,8 +177,10 @@ confirmation-dialog-cancel-button = Cancel
 confirmation-dialog-dismiss-button =
   .title = Cancel
 
-about-logins-confirm-remove-dialog-title = Remove this login?
-confirm-delete-dialog-message = This action cannot be undone.
+# Title for modal to confirm the removal of one saved password
+about-logins-confirm-delete-dialog-title = Remove password?
+# Message for modal to confirm the removal of one saved password
+about-logins-confirm-delete-dialog-message = You cannot undo this action.
 about-logins-confirm-remove-dialog-confirm-button = Remove
 
 ## Variables
@@ -189,32 +192,38 @@ about-logins-confirm-remove-all-dialog-confirm-button-label =
     *[other] Remove All
   }
 
-about-logins-confirm-remove-all-dialog-checkbox-label =
+# Checkbox for modal to confirm the removal of saved passwords
+about-logins-confirm-remove-all-dialog-checkbox-label2 =
   { $count ->
-     [1] Yes, remove this login
-    *[other] Yes, remove these logins
+     [1] Yes, remove password
+    *[other] Yes, remove passwords
   }
 
-about-logins-confirm-remove-all-dialog-title =
+# Title for modal to confirm the removal of all saved passwords when user is NOT synced
+about-logins-confirm-remove-all-dialog-title2 =
   { $count ->
-     [one] Remove { $count } login?
-    *[other] Remove all { $count } logins?
+     [one] Remove { $count } password?
+    *[other] Remove all { $count } passwords?
   }
-about-logins-confirm-remove-all-dialog-message =
+# Message for modal to confirm the removal of saved passwords when user is NOT synced
+about-logins-confirm-remove-all-dialog-message2 =
   { $count ->
-     [1] This will remove the login you’ve saved to { -brand-short-name } and any breach alerts that appear here. You won’t be able to undo this action.
-    *[other] This will remove the logins you’ve saved to { -brand-short-name } and any breach alerts that appear here. You won’t be able to undo this action.
+     [1] This will remove the password saved to { -brand-short-name } and any breach alerts. You cannot undo this action.
+    *[other] This will remove the passwords saved to { -brand-short-name } and any breach alerts. You cannot undo this action.
   }
 
-about-logins-confirm-remove-all-sync-dialog-title =
+# Title for modal to confirm the removal of all saved passwords when user IS SYNCED
+about-logins-confirm-remove-all-sync-dialog-title2 =
   { $count ->
-     [one] Remove { $count } login from all devices?
-    *[other] Remove all { $count } logins from all devices?
+     [one] Remove { $count } password from all devices?
+    *[other] Remove all { $count } passwords from all devices?
   }
-about-logins-confirm-remove-all-sync-dialog-message2=
+
+# Message for modal to confirm the removal of saved passwords when user IS synced.
+about-logins-confirm-remove-all-sync-dialog-message3 =
   { $count ->
-     [1] This will remove the login you’ve saved to { -brand-short-name } on all devices synced to your account. This will also remove breach alerts that appear here. You won’t be able to undo this action.
-    *[other] This will remove all logins you’ve saved to { -brand-short-name } on all devices synced to your account. This will also remove breach alerts that appear here. You won’t be able to undo this action.
+    [1] This will remove the passwords saved to { -brand-short-name } on all your synced devices. This will also remove any breach alerts that appear here. You cannot undo this action.
+    *[other] This will remove all passwords saved to { -brand-short-name } on all your synced devices. This will also remove any breach alerts that appear here. You cannot undo this action.
   }
 
 ##

browser/locales/en-US/browser/confirmationHints.ftl

@@ -5,7 +5,7 @@
 ## Confirmation hints
 
 confirmation-hint-breakage-report-sent = Report sent. Thank you!
-confirmation-hint-login-removed = Login removed!
+confirmation-hint-password-removed = Password removed!
 confirmation-hint-page-bookmarked = Saved to bookmarks
 confirmation-hint-password-created = Password saved
 confirmation-hint-password-updated = Password updated

toolkit/components/passwordmgr/LoginManagerPrompter.sys.mjs

@@ -617,7 +617,7 @@ export class LoginManagerPrompter {
           lazy.log.debug("Showing the ConfirmationHint");
           anchor.ownerGlobal.ConfirmationHint.show(
             anchor,
-            "confirmation-hint-login-removed"
+            "confirmation-hint-password-removed"
           );
         },
       });