From b549df3ae7ab0509751fb24f4b0c7587eda784e8 Mon Sep 17 00:00:00 2001
From: Sidharth Sachdev <ssachdev@mozilla.com>
Date: Tue, 5 Dec 2023 00:17:49 +0000
Subject: [PATCH] Bug 1867013 - Update Strings for about:logins - Import
 Passwords. r=credential-management-reviewers,bolsson,issammani

Differential Revision: https://phabricator.services.mozilla.com/D195048
---
 .../aboutlogins/AboutLoginsParent.sys.mjs     |  2 +-
 .../aboutlogins/content/aboutLogins.html      |  6 ++--
 .../content/aboutLoginsImportReport.html      |  8 ++---
 .../content/aboutLoginsImportReport.mjs       |  6 ++--
 .../content/components/import-details-row.mjs |  6 ++--
 .../components/import-summary-dialog.mjs      |  6 ++--
 .../tests/browser/browser_openImportCSV.js    |  6 ++--
 browser/locales/en-US/browser/aboutLogins.ftl | 34 +++++++++----------
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/browser/components/aboutlogins/AboutLoginsParent.sys.mjs b/browser/components/aboutlogins/AboutLoginsParent.sys.mjs
index 37829ffea88e..2eb112a6aa00 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.sys.mjs
+++ b/browser/components/aboutlogins/AboutLoginsParent.sys.mjs
@@ -446,7 +446,7 @@ export class AboutLoginsParent extends JSWindowActorParent {
     let [title, okButtonLabel, csvFilterTitle, tsvFilterTitle] =
       await lazy.AboutLoginsL10n.formatValues([
         {
-          id: "about-logins-import-file-picker-title",
+          id: "about-logins-import-file-picker-title2",
         },
         {
           id: "about-logins-import-file-picker-import-button",
diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
index de590d4cf8d6..cd95c5bc59f6 100644
--- a/browser/components/aboutlogins/content/aboutLogins.html
+++ b/browser/components/aboutlogins/content/aboutLogins.html
@@ -90,13 +90,13 @@
         <img slot="dialog-icon" part="dialog-icon" src="chrome://browser/skin/import.svg"/>
         <div slot="content" class="content">
           <div class="import-summary">
-            <div class="import-items-added import-items-row" data-l10n-id="about-logins-import-dialog-items-added" data-l10n-args='{"count": 0}'>
+            <div class="import-items-added import-items-row" data-l10n-id="about-logins-import-dialog-items-added2" data-l10n-args='{"count": 0}'>
               <span data-l10n-name="count" class="result-count"></span>
             </div>
-            <div class="import-items-modified import-items-row" data-l10n-id="about-logins-import-dialog-items-modified" data-l10n-args='{"count": 0}'>
+            <div class="import-items-modified import-items-row" data-l10n-id="about-logins-import-dialog-items-modified2" data-l10n-args='{"count": 0}'>
               <span data-l10n-name="count" class="result-count"></span>
             </div>
-            <div class="import-items-no-change import-items-row" data-l10n-id="about-logins-import-dialog-items-no-change" data-l10n-name="no-change" data-l10n-args='{"count": 0}'>
+            <div class="import-items-no-change import-items-row" data-l10n-id="about-logins-import-dialog-items-no-change2" data-l10n-name="no-change" data-l10n-args='{"count": 0}'>
               <span data-l10n-name="count" class="result-count"></span>
               <span hidden data-l10n-name="meta" class="result-meta"></span>
             </div>
diff --git a/browser/components/aboutlogins/content/aboutLoginsImportReport.html b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
index 5f52fdf29e15..9ab2641ca27d 100644
--- a/browser/components/aboutlogins/content/aboutLoginsImportReport.html
+++ b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
@@ -39,7 +39,7 @@
     <section id="report-body">
       <div class="summary">
         <h2 data-l10n-id="about-logins-import-report-title"></h2>
-        <div data-l10n-id="about-logins-import-report-description"></div>
+        <div data-l10n-id="about-logins-import-report-description2"></div>
         <a
           href="https://support.mozilla.org/kb/import-login-data-file"
           class="about-logins-import-report-learn-more"
@@ -50,7 +50,7 @@
       </div>
       <div
         class="new-logins"
-        data-l10n-id="about-logins-import-report-added"
+        data-l10n-id="about-logins-import-report-added2"
         data-l10n-args='{"count": 0}'
       >
         <div data-l10n-name="count" class="result-count"></div>
@@ -58,7 +58,7 @@
       </div>
       <div
         class="exiting-logins"
-        data-l10n-id="about-logins-import-report-modified"
+        data-l10n-id="about-logins-import-report-modified2"
         data-l10n-args='{"count": 0}'
       >
         <div data-l10n-name="count" class="result-count"></div>
@@ -66,7 +66,7 @@
       </div>
       <div
         class="duplicate-logins"
-        data-l10n-id="about-logins-import-report-no-change"
+        data-l10n-id="about-logins-import-report-no-change2"
         data-l10n-args='{"count": 0}'
       >
         <div data-l10n-name="count" class="result-count"></div>
diff --git a/browser/components/aboutlogins/content/aboutLoginsImportReport.mjs b/browser/components/aboutlogins/content/aboutLoginsImportReport.mjs
index 38002563826f..6f5943ee46d9 100644
--- a/browser/components/aboutlogins/content/aboutLoginsImportReport.mjs
+++ b/browser/components/aboutlogins/content/aboutLoginsImportReport.mjs
@@ -33,17 +33,17 @@ function importReportDataHandler(event) {
       }
       document.l10n.setAttributes(
         detailedNewCount,
-        "about-logins-import-report-added",
+        "about-logins-import-report-added2",
         { count: report.added }
       );
       document.l10n.setAttributes(
         detailedExitingCount,
-        "about-logins-import-report-modified",
+        "about-logins-import-report-modified2",
         { count: report.modified }
       );
       document.l10n.setAttributes(
         detailedDuplicateCount,
-        "about-logins-import-report-no-change",
+        "about-logins-import-report-no-change2",
         { count: report.no_change }
       );
       document.l10n.setAttributes(
diff --git a/browser/components/aboutlogins/content/components/import-details-row.mjs b/browser/components/aboutlogins/content/components/import-details-row.mjs
index 13fe40da59e3..8b6fe269a3ed 100644
--- a/browser/components/aboutlogins/content/components/import-details-row.mjs
+++ b/browser/components/aboutlogins/content/components/import-details-row.mjs
@@ -4,13 +4,13 @@
 
 const resultToUiData = {
   no_change: {
-    message: "about-logins-import-report-row-description-no-change",
+    message: "about-logins-import-report-row-description-no-change2",
   },
   modified: {
-    message: "about-logins-import-report-row-description-modified",
+    message: "about-logins-import-report-row-description-modified2",
   },
   added: {
-    message: "about-logins-import-report-row-description-added",
+    message: "about-logins-import-report-row-description-added2",
   },
   error: {
     message: "about-logins-import-report-row-description-error",
diff --git a/browser/components/aboutlogins/content/components/import-summary-dialog.mjs b/browser/components/aboutlogins/content/components/import-summary-dialog.mjs
index 76d19b019088..3b8433852759 100644
--- a/browser/components/aboutlogins/content/components/import-summary-dialog.mjs
+++ b/browser/components/aboutlogins/content/components/import-summary-dialog.mjs
@@ -39,17 +39,17 @@ export default class ImportSummaryDialog extends HTMLElement {
     this._updateCount(
       report.added,
       this._added,
-      "about-logins-import-dialog-items-added"
+      "about-logins-import-dialog-items-added2"
     );
     this._updateCount(
       report.modified,
       this._modified,
-      "about-logins-import-dialog-items-modified"
+      "about-logins-import-dialog-items-modified2"
     );
     this._updateCount(
       report.no_change,
       this._noChange,
-      "about-logins-import-dialog-items-no-change"
+      "about-logins-import-dialog-items-no-change2"
     );
     this._updateCount(
       report.error,
diff --git a/browser/components/aboutlogins/tests/browser/browser_openImportCSV.js b/browser/components/aboutlogins/tests/browser/browser_openImportCSV.js
index c4994215d8cb..4800b8a309de 100644
--- a/browser/components/aboutlogins/tests/browser/browser_openImportCSV.js
+++ b/browser/components/aboutlogins/tests/browser/browser_openImportCSV.js
@@ -366,9 +366,9 @@ add_task(async function test_open_import_all_four_detailed_report() {
       Assert.equal(errors, 1, "It should have one item as error");
       Assert.deepEqual(
         [
-          "about-logins-import-report-row-description-added",
-          "about-logins-import-report-row-description-modified",
-          "about-logins-import-report-row-description-no-change",
+          "about-logins-import-report-row-description-added2",
+          "about-logins-import-report-row-description-modified2",
+          "about-logins-import-report-row-description-no-change2",
           "about-logins-import-report-row-description-error-missing-field",
         ],
         rows,
diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl
index 49d384918a1b..0ca9d5166ea6 100644
--- a/browser/locales/en-US/browser/aboutLogins.ftl
+++ b/browser/locales/en-US/browser/aboutLogins.ftl
@@ -277,7 +277,7 @@ about-logins-export-file-picker-csv-filter-title =
 ## Login Import Dialog
 
 # Title of the file picker dialog
-about-logins-import-file-picker-title = Import Logins File
+about-logins-import-file-picker-title2 = Import Passwords to { -brand-short-name }
 about-logins-import-file-picker-import-button = Import
 # A description for the .csv file format that may be shown as the file type
 # filter by the operating system.
@@ -299,19 +299,19 @@ about-logins-import-file-picker-tsv-filter-title =
 ##  $count (number) - The number of affected elements
 
 about-logins-import-dialog-title = Import Complete
-about-logins-import-dialog-items-added =
+about-logins-import-dialog-items-added2 =
   { $count ->
-     *[other] <span>New logins added:</span> <span data-l10n-name="count">{ $count }</span>
+     *[other] <span>New passwords added:</span> <span data-l10n-name="count">{ $count }</span>
   }
 
-about-logins-import-dialog-items-modified =
+about-logins-import-dialog-items-modified2 =
   { $count ->
-     *[other] <span>Existing logins updated:</span> <span data-l10n-name="count">{ $count }</span>
+     *[other] <span>Existing entries updated:</span> <span data-l10n-name="count">{ $count }</span>
   }
 
-about-logins-import-dialog-items-no-change =
+about-logins-import-dialog-items-no-change2 =
   { $count ->
-     *[other] <span>Duplicate logins found:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
+     *[other] <span>Duplicate entries found:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
   }
 about-logins-import-dialog-items-error =
   { $count ->
@@ -334,15 +334,15 @@ about-logins-import-dialog-error-try-import-again = Try Import Again…
 about-logins-import-dialog-error-cancel = Cancel
 
 about-logins-import-report-title = Import Summary
-about-logins-import-report-description = Logins and passwords imported to { -brand-short-name }.
+about-logins-import-report-description2 = Passwords imported to { -brand-short-name }.
 
 #
 # Variables:
 #  $number (number) - The number of the row
 about-logins-import-report-row-index = Row { $number }
-about-logins-import-report-row-description-no-change = Duplicate: Exact match of existing login
-about-logins-import-report-row-description-modified = Existing login updated
-about-logins-import-report-row-description-added = New login added
+about-logins-import-report-row-description-no-change2 = Duplicate: Exact match of existing entry
+about-logins-import-report-row-description-modified2 = Existing entry updated
+about-logins-import-report-row-description-added2 = New password added
 about-logins-import-report-row-description-error = Error: Missing field
 
 ##
@@ -356,17 +356,17 @@ about-logins-import-report-row-description-error-missing-field = Error: Missing
 ## Variables:
 ##  $count (number) - The number of affected elements
 
-about-logins-import-report-added =
+about-logins-import-report-added2 =
   { $count ->
-      *[other] <div data-l10n-name="count">{ $count }</div> <div data-l10n-name="details">New logins added</div>
+      *[other] <div data-l10n-name="count">{ $count }</div> <div data-l10n-name="details">New passwords added</div>
   }
-about-logins-import-report-modified =
+about-logins-import-report-modified2 =
   { $count ->
-      *[other] <div data-l10n-name="count">{ $count }</div> <div data-l10n-name="details">Existing logins updated</div>
+      *[other] <div data-l10n-name="count">{ $count }</div> <div data-l10n-name="details">Existing entries updated</div>
   }
-about-logins-import-report-no-change =
+about-logins-import-report-no-change2 =
   { $count ->
-      *[other] <div data-l10n-name="count">{ $count }</div> <div data-l10n-name="details">Duplicate logins</div> <div data-l10n-name="not-imported">(not imported)</div>
+      *[other] <div data-l10n-name="count">{ $count }</div> <div data-l10n-name="details">Duplicate entries</div> <div data-l10n-name="not-imported">(not imported)</div>
   }
 about-logins-import-report-error =
   { $count ->